diff --git a/bsp/buildroot_external/package/ubus/ubus.mk b/bsp/buildroot_external/package/ubus/ubus.mk index 2228a8b4..63aad044 100644 --- a/bsp/buildroot_external/package/ubus/ubus.mk +++ b/bsp/buildroot_external/package/ubus/ubus.mk @@ -6,16 +6,16 @@ UBUS_VERSION:= 1.0.0 -UBUS_SITE = $(TOPDIR)/../../../AwoxAudio/Libs/External/ubus/ubusd/builders/cmake +UBUS_SITE = $(TOPDIR)/../../src/3P/ubus/builders/cmake UBUS_SITE_METHOD = local UBUS_INSTALL_STAGING = YES -UBUS_DEPENDENCIES = libubus +UBUS_DEPENDENCIES = libubox -CONF = AWOXCVS3=$(TOPDIR)/../../../ +UBUS_CONF = SRC_DIR=$(TOPDIR)/../.. -UBUS_CONF_ENV = $(CONF) -UBUS_MAKE_ENV = $(CONF) -UBUS_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +UBUS_CONF_ENV = $(UBUS_CONF) +UBUS_MAKE_ENV = $(UBUS_CONF) +UBUS_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(eval $(cmake-package)) diff --git a/src/3P/ubus/builders/cmake/CMakeLists.txt b/src/3P/ubus/builders/cmake/CMakeLists.txt new file mode 100644 index 00000000..0733b05a --- /dev/null +++ b/src/3P/ubus/builders/cmake/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 3.0) + +project (ubus) + +set (CMAKE_MODULE_PATH "${MODULE_PATH}") + +set(DISABLE_TARGET_OPTIMIZATION ON) + +include (br) + +include_directories ($ENV{SRC_DIR}/src/3P/ubus) + +ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations -D_GNU_SOURCE) + +ADD_DEFINITIONS (-DUBUS_MAX_MSGLEN=1048576) +ADD_DEFINITIONS (-DUBUS_UNIX_SOCKET="/tmp/ubus.sock") + +# ubus library +file ( + GLOB_RECURSE + source_files + + $ENV{SRC_DIR}/src/3P/ubus/libubus.c + $ENV{SRC_DIR}/src/3P/ubus/libubus-io.c + $ENV{SRC_DIR}/src/3P/ubus/libubus-obj.c + $ENV{SRC_DIR}/src/3P/ubus/libubus-sub.c + $ENV{SRC_DIR}/src/3P/ubus/libubus-req.c + $ENV{SRC_DIR}/src/3P/ubus/libubus-acl.c + ) + +# Library +add_library (ubus SHARED ${source_files}) +target_link_libraries (ubus LINK_PUBLIC ubox) + +target_include_directories (ubus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +install (TARGETS ubus LIBRARY DESTINATION local/lib) + +file (GLOB ubus_headers $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/*.h) +install (FILES ${ubus_headers} DESTINATION include/ubus) + + +# Daemon ubusd +file ( + GLOB_RECURSE + ubusd_source_files + + $ENV{SRC_DIR}/src/3P/ubus/ubusd.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_id.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_obj.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_proto.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_event.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_acl.c + $ENV{SRC_DIR}/src/3P/ubus/ubusd_monitor.c + ) + +# Daemon ubusd +add_executable (ubusd ${ubusd_source_files}) +target_link_libraries (ubusd ubox blobmsg_json) + +install (TARGETS ubusd RUNTIME DESTINATION ../sbin) + +# cmd line tool. +add_executable (ucli $ENV{SRC_DIR}/src/3P/ubus/cli.c) +set_target_properties (ucli PROPERTIES OUTPUT_NAME ubus) +target_link_libraries (ucli LINK_PUBLIC ubox ubus blobmsg_json) + +install (TARGETS ucli RUNTIME DESTINATION bin) \ No newline at end of file diff --git a/src/3P/ubus/libubus/builders/cmake/CMakeLists.txt b/src/3P/ubus/libubus/builders/cmake/CMakeLists.txt deleted file mode 100644 index c504a7c7..00000000 --- a/src/3P/ubus/libubus/builders/cmake/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -cmake_minimum_required (VERSION 3.0) - -project (libubus) - -set (CMAKE_MODULE_PATH "${MODULE_PATH}") - -set(DISABLE_TARGET_OPTIMIZATION ON) - -include (aw) - -include_directories ($ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/) - -ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations) - -ADD_DEFINITIONS (-DUBUS_MAX_MSGLEN=1048576) -ADD_DEFINITIONS (-DUBUS_UNIX_SOCKET="/tmp/ubus.sock") - -file ( - GLOB_RECURSE - source_files - - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus-io.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus-obj.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus-sub.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus-req.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/libubus-acl.c - ) - -# Library -add_library (ubus SHARED ${source_files}) -target_link_libraries (ubus - LINK_PUBLIC - ubox) - -target_include_directories (ubus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -install (TARGETS ubus - LIBRARY DESTINATION local/lib -) - -file (GLOB ubus_headers $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/*.h) -install (FILES ${ubus_headers} DESTINATION include/ubus) diff --git a/src/3P/ubus/ubusd/builders/cmake/CMakeLists.txt b/src/3P/ubus/ubusd/builders/cmake/CMakeLists.txt deleted file mode 100644 index f9d2a5e1..00000000 --- a/src/3P/ubus/ubusd/builders/cmake/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -cmake_minimum_required(VERSION 3.0) - -project (ubusd) - -set (CMAKE_MODULE_PATH "${MODULE_PATH}") - -set(DISABLE_TARGET_OPTIMIZATION ON) - -include (aw) - -include_directories ($ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/) - -ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations) - -ADD_DEFINITIONS (-DUBUS_MAX_MSGLEN=1048576) -ADD_DEFINITIONS (-DUBUS_UNIX_SOCKET="/tmp/ubus.sock") - -file ( - GLOB_RECURSE - ubusd_source_files - - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_id.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_obj.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_proto.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_event.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_acl.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/ubusd_monitor.c - ) - -# Daemon -add_executable (ubusd ${ubusd_source_files}) -target_link_libraries (ubusd ubox blobmsg_json) - - -install (TARGETS ubusd - RUNTIME DESTINATION ../sbin -) diff --git a/src/3P/ubus/ucli/builders/cmake/CMakeLists.txt b/src/3P/ubus/ucli/builders/cmake/CMakeLists.txt deleted file mode 100644 index 57ea624d..00000000 --- a/src/3P/ubus/ucli/builders/cmake/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -cmake_minimum_required(VERSION 3.0) - -project (ubus-cli) - -set (CMAKE_MODULE_PATH "${MODULE_PATH}") - -set(DISABLE_TARGET_OPTIMIZATION ON) - -include (aw) - -include_directories ($ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/) - -ADD_DEFINITIONS (-Werror --std=gnu99 -Wmissing-declarations) - -ADD_DEFINITIONS (-DUBUS_MAX_MSGLEN=1048576) -ADD_DEFINITIONS (-DUBUS_UNIX_SOCKET="/tmp/ubus.sock") - -file ( - GLOB_RECURSE - source_files - - $ENV{AWOXCVS}/AwoxAudio/Libs/External/ubus/cli.c - ) - -# Daemon -add_executable (ucli ${source_files}) -set_target_properties (ucli PROPERTIES OUTPUT_NAME ubus) -target_link_libraries (ucli LINK_PUBLIC ubox ubus blobmsg_json) - -install (TARGETS ucli RUNTIME DESTINATION bin)