Commit ff8687a7 authored by 黄振令's avatar 黄振令

【修改内容】恢复编译ota功能

【提交人】huang.zhenling
parent 8c997561
...@@ -88,6 +88,7 @@ INCLUDES= \ ...@@ -88,6 +88,7 @@ INCLUDES= \
-I../../../platform/base/hal/micro/unix/host/board \ -I../../../platform/base/hal/micro/unix/host/board \
-I./rpc_api/inc \ -I./rpc_api/inc \
-I../../../../../common/sqlite/ \ -I../../../../../common/sqlite/ \
-I../../../../../common/curl/include \
-I./ZB -I./ZB
\ \
...@@ -287,6 +288,7 @@ APPLICATION_FILES= \ ...@@ -287,6 +288,7 @@ APPLICATION_FILES= \
./ZB/kk_tsl_property_set.c\ ./ZB/kk_tsl_property_set.c\
./ZB/kk_device_table_db.c\ ./ZB/kk_device_table_db.c\
./ZB/kk_msg_report.c\ ./ZB/kk_msg_report.c\
./ZB/kk_plat_ota.c\
./kk_test.c\ ./kk_test.c\
./kk_sub_tsl.c\ ./kk_sub_tsl.c\
./kk_tsl_zigbee_map.c\ ./kk_tsl_zigbee_map.c\
...@@ -376,10 +378,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES) ...@@ -376,10 +378,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
else else
$(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES) $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
ifeq ($(CONFIG_VENDOR),ubuntu) ifeq ($(CONFIG_VENDOR),ubuntu)
$(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -ldl -o $(TARGET_FILE) $(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -lcurl_ubuntu -ldl -o $(TARGET_FILE)
@echo -e '\n$@ build success' @echo -e '\n$@ build success'
else else
$(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -o $(TARGET_FILE) $(LD) $^ $(LINKER_FLAGS) -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -lcurl -o $(TARGET_FILE)
@echo -e '\n$@ build success' @echo -e '\n$@ build success'
endif endif
endif endif
......
...@@ -238,7 +238,7 @@ void _cb(void* data, int len, char* chlmark){ ...@@ -238,7 +238,7 @@ void _cb(void* data, int len, char* chlmark){
if (info!=NULL&&strstr(rpc_cJSON_GetObjectItem(info, "msgType")->valuestring,KK_THING_OTA_DEVICE_UPGRADE) != NULL){ if (info!=NULL&&strstr(rpc_cJSON_GetObjectItem(info, "msgType")->valuestring,KK_THING_OTA_DEVICE_UPGRADE) != NULL){
//kk_ota_process(root); kk_ota_process(root);
}else{ }else{
eval_request(&my_server, root); eval_request(&my_server, root);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment