diff --git a/bsp/buildroot/package/Config.in b/bsp/buildroot/package/Config.in index 1e51a453..874b98af 100644 --- a/bsp/buildroot/package/Config.in +++ b/bsp/buildroot/package/Config.in @@ -465,7 +465,7 @@ endmenu source "package/ti-utils/Config.in" source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" - source "package/ubus/Config.in" + #source "package/ubus/Config.in" source "package/udev/Config.in" source "package/udisks/Config.in" source "package/usb_modeswitch/Config.in" @@ -1305,7 +1305,7 @@ menu "Other" source "package/libtasn1/Config.in" source "package/libtommath/Config.in" source "package/libtpl/Config.in" - source "package/libubox/Config.in" + #source "package/libubox/Config.in" source "package/libuci/Config.in" source "package/libunwind/Config.in" source "package/liburcu/Config.in" diff --git a/bsp/buildroot_external/Config.in b/bsp/buildroot_external/Config.in index 00b1d51f..0ce6faff 100644 --- a/bsp/buildroot_external/Config.in +++ b/bsp/buildroot_external/Config.in @@ -1,3 +1,18 @@ +menu "Third parties" + +# LIBUBOX +source "$BR2_EXTERNAL/package/libubox/Config.in" + +# PROCD +source "$BR2_EXTERNAL/package/procd/Config.in" + +# UBOX +source "$BR2_EXTERNAL/package/ubox/Config.in" + +# UBUS +source "$BR2_EXTERNAL/package/ubus/Config.in" + +endmenu # Third parties menu "Domo" diff --git a/bsp/buildroot_external/package/libubox/Config.in b/bsp/buildroot_external/package/libubox/Config.in new file mode 100644 index 00000000..3e2e8bd9 --- /dev/null +++ b/bsp/buildroot_external/package/libubox/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBUBOX + bool "libubox" + default n + select BR2_PACKAGE_JSON_C + help + New Version of the ubox library. diff --git a/bsp/buildroot_external/package/libubox/libubox.mk b/bsp/buildroot_external/package/libubox/libubox.mk new file mode 100644 index 00000000..fa401fcc --- /dev/null +++ b/bsp/buildroot_external/package/libubox/libubox.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# LIB UBOX +# +################################################################################ + +LIBUBOX_VERSION:= 2016.07.29 + +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_ENV = $(CONF) +LIBUBOX_MAKE_ENV = $(CONF) +LIBUBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) + +$(eval $(cmake-package)) diff --git a/bsp/buildroot_external/package/procd/Config.in b/bsp/buildroot_external/package/procd/Config.in new file mode 100644 index 00000000..f53d1316 --- /dev/null +++ b/bsp/buildroot_external/package/procd/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PROCD + bool "procd" + select BR2_PACKAGE_UBOX + select BR2_PACKAGE_UBUS + select BR2_PACKAGE_JSON_C + default n + help + This program manage process. + +config BR2_PACKAGE_PROCD_DISABLE_INIT + depends on BR2_PACKAGE_PROCD + bool "Disable the init part of procd" + default n + help + Disable the init part of procd diff --git a/bsp/buildroot_external/package/procd/procd.mk b/bsp/buildroot_external/package/procd/procd.mk new file mode 100644 index 00000000..f2dcf7d2 --- /dev/null +++ b/bsp/buildroot_external/package/procd/procd.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# PROCD +# +################################################################################ + +PROCD_VERSION:= 2016.07.29 + +PROCD_SITE = $(TOPDIR)/../../../AwoxAudio/Products/External/procd/builders/cmake +PROCD_SITE_METHOD = local +PROCD_INSTALL_STAGING = YES + +PROCD_DEPENDENCIES = libubox-aw libubus json-c + +CONF = AWOXCVS=$(TOPDIR)/../../../ + +ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y) +PROCD_CONF_OPTS += -DDISABLE_INIT=ON +endif + +PROCD_CONF_ENV = $(CONF) +PROCD_MAKE_ENV = $(CONF) +PROCD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) + +$(eval $(cmake-package)) diff --git a/bsp/buildroot_external/package/ubox/Config.in b/bsp/buildroot_external/package/ubox/Config.in new file mode 100644 index 00000000..cdc8fb8c --- /dev/null +++ b/bsp/buildroot_external/package/ubox/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_UBOX + bool "ubox tools" + default n + select BR2_PACKAGE_LIBUBOX_AW + select BR2_PACKAGE_LIBUBUS + help + Ubox tools. diff --git a/bsp/buildroot_external/package/ubox/ubox.mk b/bsp/buildroot_external/package/ubox/ubox.mk new file mode 100644 index 00000000..1fd25d0b --- /dev/null +++ b/bsp/buildroot_external/package/ubox/ubox.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# UBOX TOOLS +# +################################################################################ + +UBOX_VERSION:= 2016.07.19 + +UBOX_SITE = $(TOPDIR)/../../../AwoxAudio/Products/External/ubox/builders/cmake +UBOX_SITE_METHOD = local +UBOX_INSTALL_STAGING = YES + +UBOX_DEPENDENCIES = libubox-aw libubus + +CONF = AWOXCVS=$(TOPDIR)/../../../ + +UBOX_CONF_ENV = $(CONF) +UBOX_MAKE_ENV = $(CONF) +UBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) + +$(eval $(cmake-package)) diff --git a/bsp/buildroot_external/package/ubus/Config.in b/bsp/buildroot_external/package/ubus/Config.in new file mode 100644 index 00000000..f014e126 --- /dev/null +++ b/bsp/buildroot_external/package/ubus/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_UBUSD + bool "ubus daemon" + default n + select BR2_PACKAGE_LIBUBUS + help + Awox Version of the ubus daemon programs. diff --git a/bsp/buildroot_external/package/ubus/ubus.mk b/bsp/buildroot_external/package/ubus/ubus.mk new file mode 100644 index 00000000..f7d8c020 --- /dev/null +++ b/bsp/buildroot_external/package/ubus/ubus.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# UBUSD PROGRAM +# +################################################################################ + +UBUSD_VERSION:= 1.0.0 + +UBUSD_SITE = $(TOPDIR)/../../../AwoxAudio/Libs/External/ubus/ubusd/builders/cmake +UBUSD_SITE_METHOD = local +UBUSD_INSTALL_STAGING = YES + +UBUSD_DEPENDENCIES = libubus + +CONF = AWOXCVS=$(TOPDIR)/../../../ + +UBUSD_CONF_ENV = $(CONF) +UBUSD_MAKE_ENV = $(CONF) +UBUSD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) + +$(eval $(cmake-package)) diff --git a/projects/pi_domo/configs/buildroot.config b/projects/pi_domo/configs/buildroot.config index b50ab259..64d13abc 100644 --- a/projects/pi_domo/configs/buildroot.config +++ b/projects/pi_domo/configs/buildroot.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2016.08.1-gf047b39-dirty Configuration +# Buildroot 2016.08.1-gf8dc251-dirty Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_6=y @@ -861,7 +861,6 @@ BR2_PACKAGE_UBOOT_TOOLS=y # BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE is not set BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV=y # BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE is not set -# BR2_PACKAGE_UBUS is not set # # udisks needs udev /dev management @@ -1224,7 +1223,7 @@ BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS=y BR2_PACKAGE_EXPAT=y # BR2_PACKAGE_EZXML is not set # BR2_PACKAGE_JANSSON is not set -# BR2_PACKAGE_JSON_C is not set +BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_JSON_GLIB is not set # BR2_PACKAGE_JSONCPP is not set # BR2_PACKAGE_LIBFASTJSON is not set @@ -1474,7 +1473,6 @@ BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBTASN1 is not set # BR2_PACKAGE_LIBTOMMATH is not set # BR2_PACKAGE_LIBTPL is not set -# BR2_PACKAGE_LIBUBOX is not set # BR2_PACKAGE_LIBUCI is not set BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBUNWIND is not set @@ -2425,6 +2423,14 @@ BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="" # User-provided options # +# +# Third parties +# +BR2_PACKAGE_LIBUBOX=y +# BR2_PACKAGE_PROCD is not set +# BR2_PACKAGE_UBOX is not set +# BR2_PACKAGE_UBUSD is not set + # # Domo #