diff --git a/bsp/board/domo/configs/busybox.config b/bsp/board/domo/configs/busybox.config index d5eb78bd..8836037d 100644 --- a/bsp/board/domo/configs/busybox.config +++ b/bsp/board/domo/configs/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.25.0 -# Tue Oct 18 18:28:48 2016 +# Tue Nov 22 12:31:53 2016 # CONFIG_HAVE_DOT_CONFIG=y @@ -17,14 +17,14 @@ CONFIG_HAVE_DOT_CONFIG=y CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y +# CONFIG_FEATURE_INSTALLER is not set # CONFIG_INSTALL_NO_USR is not set # CONFIG_LOCALE_SUPPORT is not set # CONFIG_UNICODE_SUPPORT is not set @@ -135,7 +135,7 @@ CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set -CONFIG_FEATURE_SEAMLESS_GZ=y +# CONFIG_FEATURE_SEAMLESS_GZ is not set # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set @@ -243,7 +243,7 @@ CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y # CONFIG_FOLD is not set -CONFIG_FSYNC=y +# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_INSTALL is not set @@ -528,11 +528,11 @@ CONFIG_FEATURE_PASSWD_WEAK_CHECK=y # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set @@ -546,11 +546,11 @@ CONFIG_MODPROBE=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities @@ -615,7 +615,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_HEXDUMP=y # CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set -CONFIG_HWCLOCK=y +# CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IPCRM is not set @@ -872,18 +872,18 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_NTPD=y +CONFIG_FEATURE_NTPD_SERVER=y # CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_TCPSVD is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_TFTPD is not set @@ -900,12 +900,12 @@ CONFIG_TRACEROUTE=y # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_UDHCPC6 is not set -# CONFIG_UDHCPD is not set +CONFIG_UDHCPD=y # CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DUMPLEASES=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y @@ -918,7 +918,7 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set -# CONFIG_ZCIP is not set +CONFIG_ZCIP=y # # Print Utilities diff --git a/bsp/buildroot_external/package/libubox/libubox.mk b/bsp/buildroot_external/package/libubox/libubox.mk index fa401fcc..865afa0b 100644 --- a/bsp/buildroot_external/package/libubox/libubox.mk +++ b/bsp/buildroot_external/package/libubox/libubox.mk @@ -6,16 +6,16 @@ LIBUBOX_VERSION:= 2016.07.29 -LIBUBOX_SITE = $(TOPDIR)/../../../src/3P/libubox/builders/cmake +LIBUBOX_SITE = $(TOPDIR)/../../src/3P/libubox/builders/cmake LIBUBOX_SITE_METHOD = local LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = json-c -CONF = SRC_DIR=$(TOPDIR)/../../../ +LIBUBOX_CONF = SRC_DIR=$(TOPDIR)/../.. -LIBUBOX_CONF_ENV = $(CONF) -LIBUBOX_MAKE_ENV = $(CONF) -LIBUBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +LIBUBOX_CONF_ENV = $(LIBUBOX_CONF) +LIBUBOX_MAKE_ENV = $(LIBUBOX_CONF) +LIBUBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(eval $(cmake-package)) diff --git a/bsp/buildroot_external/package/procd/procd.mk b/bsp/buildroot_external/package/procd/procd.mk index f2dcf7d2..31f54555 100644 --- a/bsp/buildroot_external/package/procd/procd.mk +++ b/bsp/buildroot_external/package/procd/procd.mk @@ -12,7 +12,7 @@ PROCD_INSTALL_STAGING = YES PROCD_DEPENDENCIES = libubox-aw libubus json-c -CONF = AWOXCVS=$(TOPDIR)/../../../ +CONF = AWOXCVS4=$(TOPDIR)/../../../ ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y) PROCD_CONF_OPTS += -DDISABLE_INIT=ON diff --git a/bsp/buildroot_external/package/ubox/Config.in b/bsp/buildroot_external/package/ubox/Config.in index cdc8fb8c..a5756828 100644 --- a/bsp/buildroot_external/package/ubox/Config.in +++ b/bsp/buildroot_external/package/ubox/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_UBOX bool "ubox tools" default n - select BR2_PACKAGE_LIBUBOX_AW - select BR2_PACKAGE_LIBUBUS + select BR2_PACKAGE_LIBUBOX + select BR2_PACKAGE_UBUS help Ubox tools. diff --git a/bsp/buildroot_external/package/ubox/ubox.mk b/bsp/buildroot_external/package/ubox/ubox.mk index 1fd25d0b..ff69d165 100644 --- a/bsp/buildroot_external/package/ubox/ubox.mk +++ b/bsp/buildroot_external/package/ubox/ubox.mk @@ -6,13 +6,13 @@ UBOX_VERSION:= 2016.07.19 -UBOX_SITE = $(TOPDIR)/../../../AwoxAudio/Products/External/ubox/builders/cmake +UBOX_SITE = $(TOPDIR)/../../src/3P/ubox/builders/cmake UBOX_SITE_METHOD = local UBOX_INSTALL_STAGING = YES -UBOX_DEPENDENCIES = libubox-aw libubus +UBOX_DEPENDENCIES = libubox ubus -CONF = AWOXCVS=$(TOPDIR)/../../../ +CONF = AWOXCVS2=$(TOPDIR)/../../../ UBOX_CONF_ENV = $(CONF) UBOX_MAKE_ENV = $(CONF) diff --git a/bsp/buildroot_external/package/ubus/Config.in b/bsp/buildroot_external/package/ubus/Config.in index f014e126..41250dd4 100644 --- a/bsp/buildroot_external/package/ubus/Config.in +++ b/bsp/buildroot_external/package/ubus/Config.in @@ -1,6 +1,6 @@ -config BR2_PACKAGE_UBUSD - bool "ubus daemon" +config BR2_PACKAGE_UBUS + bool "ubus" default n - select BR2_PACKAGE_LIBUBUS + select BR2_PACKAGE_LIBUBOX help - Awox Version of the ubus daemon programs. + Next Version of the ubus daemon programs. diff --git a/bsp/buildroot_external/package/ubus/ubus.mk b/bsp/buildroot_external/package/ubus/ubus.mk index f7d8c020..2228a8b4 100644 --- a/bsp/buildroot_external/package/ubus/ubus.mk +++ b/bsp/buildroot_external/package/ubus/ubus.mk @@ -1,21 +1,21 @@ ################################################################################ # -# UBUSD PROGRAM +# UBUS # ################################################################################ -UBUSD_VERSION:= 1.0.0 +UBUS_VERSION:= 1.0.0 -UBUSD_SITE = $(TOPDIR)/../../../AwoxAudio/Libs/External/ubus/ubusd/builders/cmake -UBUSD_SITE_METHOD = local -UBUSD_INSTALL_STAGING = YES +UBUS_SITE = $(TOPDIR)/../../../AwoxAudio/Libs/External/ubus/ubusd/builders/cmake +UBUS_SITE_METHOD = local +UBUS_INSTALL_STAGING = YES -UBUSD_DEPENDENCIES = libubus +UBUS_DEPENDENCIES = libubus -CONF = AWOXCVS=$(TOPDIR)/../../../ +CONF = AWOXCVS3=$(TOPDIR)/../../../ -UBUSD_CONF_ENV = $(CONF) -UBUSD_MAKE_ENV = $(CONF) -UBUSD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +UBUS_CONF_ENV = $(CONF) +UBUS_MAKE_ENV = $(CONF) +UBUS_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(eval $(cmake-package)) diff --git a/src/3P/libubox/builders/cmake/CMakeLists.txt b/src/3P/libubox/builders/cmake/CMakeLists.txt index a2ba59f0..3e8e80dd 100644 --- a/src/3P/libubox/builders/cmake/CMakeLists.txt +++ b/src/3P/libubox/builders/cmake/CMakeLists.txt @@ -6,32 +6,32 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}") set(DISABLE_TARGET_OPTIMIZATION ON) -include (aw) +include (br) ADD_DEFINITIONS(-DJSONC) -include_directories ($ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/) +include_directories ($ENV{SRC_DIR}/src/3P/libubox/) file ( GLOB_RECURSE source_files - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/avl.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/avl-cmp.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/blob.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/blobmsg.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/uloop.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/usock.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/ustream.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/ustream-fd.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/vlist.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/utils.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/safe_list.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/runqueue.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/md5.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/kvlist.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/ulog.c - $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/base64.c + $ENV{SRC_DIR}/src/3P/libubox/avl.c + $ENV{SRC_DIR}/src/3P/libubox/avl-cmp.c + $ENV{SRC_DIR}/src/3P/libubox/blob.c + $ENV{SRC_DIR}/src/3P/libubox/blobmsg.c + $ENV{SRC_DIR}/src/3P/libubox/uloop.c + $ENV{SRC_DIR}/src/3P/libubox/usock.c + $ENV{SRC_DIR}/src/3P/libubox/ustream.c + $ENV{SRC_DIR}/src/3P/libubox/ustream-fd.c + $ENV{SRC_DIR}/src/3P/libubox/vlist.c + $ENV{SRC_DIR}/src/3P/libubox/utils.c + $ENV{SRC_DIR}/src/3P/libubox/safe_list.c + $ENV{SRC_DIR}/src/3P/libubox/runqueue.c + $ENV{SRC_DIR}/src/3P/libubox/md5.c + $ENV{SRC_DIR}/src/3P/libubox/kvlist.c + $ENV{SRC_DIR}/src/3P/libubox/ulog.c + $ENV{SRC_DIR}/src/3Plibubox/base64.c ) add_library (ubox SHARED ${source_files}) @@ -45,16 +45,16 @@ target_link_libraries (ubox target_include_directories (ubox PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -file (GLOB ubox_headers $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/*.h) +file (GLOB ubox_headers $ENV{SRC_DIR}/src/3P/libubox/*.h) install (FILES ${ubox_headers} DESTINATION include/libubox) -add_library (json_script SHARED $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/json_script.c) +add_library (json_script SHARED $ENV{SRC_DIR}/src/3P/libubox/json_script.c) target_link_libraries (json_script ubox) -add_library (blobmsg_json SHARED $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/blobmsg_json.c) +add_library (blobmsg_json SHARED $ENV{SRC_DIR}/src/3P/libubox/blobmsg_json.c) target_link_libraries (blobmsg_json json-c) -add_executable (jshn $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/jshn.c) +add_executable (jshn $ENV{SRC_DIR}/src/3P/libubox/jshn.c) target_link_libraries (jshn ubox blobmsg_json json-c) install (TARGETS ubox json_script blobmsg_json @@ -63,5 +63,5 @@ install (TARGETS ubox json_script blobmsg_json install (TARGETS jshn RUNTIME DESTINATION bin) -install (FILES $ENV{AWOXCVS}/AwoxAudio/Libs/External/libubox/sh/jshn.sh +install (FILES $ENV{SRC_DIR}/src/3P/libubox/sh/jshn.sh DESTINATION share/libubox)