From 4f76e2485e6efb186d0f26b28120a863884fd408 Mon Sep 17 00:00:00 2001 From: jbnadal Date: Thu, 5 Apr 2018 19:55:54 +0200 Subject: [PATCH] Fix compilation with buildroot --- .vscode/tasks.json | 8 ++++---- bsp/buildroot_external/package/domod/Config.in | 2 +- bsp/buildroot_external/package/domod/domod.mk | 8 ++------ bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk | 6 +----- projects/x86_64_domo/configs/buildroot_defconfig | 2 +- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 69a06d1a..db5fcafe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,7 @@ { "label": "X86_64 - cmake - domod", "type": "shell", - "command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/prog/domod/builders/cmake", + "command": "mkdir -p ${BUILD_DIR}/domod && cd ${BUILD_DIR}/domod && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/prog/domod/builders/cmake", "group": "build", "options": { "env": { @@ -24,7 +24,7 @@ { "label": "X86_64 - make - domod", "options": { - "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domo", + "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domod", }, "type": "shell", "command": "make install", @@ -40,7 +40,7 @@ { "label": "X86_64 - cmake - libubus-cpp", "type": "shell", - "command": "mkdir -p ${BUILD_DIR}/ubus-cpp && cd ${BUILD_DIR}/ubus-cpp && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/lib/libubus-cpp/builders/cmake", + "command": "mkdir -p ${BUILD_DIR}/libubus-cpp && cd ${BUILD_DIR}/libubus-cpp && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/lib/libubus-cpp/builders/cmake", "group": "build", "options": { "env": { @@ -56,7 +56,7 @@ { "label": "X86_64 - make - libubus-cpp", "options": { - "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/ubus-cpp", + "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/libubus-cpp", }, "type": "shell", "command": "make install", diff --git a/bsp/buildroot_external/package/domod/Config.in b/bsp/buildroot_external/package/domod/Config.in index 6472d3b0..65bbe6bc 100644 --- a/bsp/buildroot_external/package/domod/Config.in +++ b/bsp/buildroot_external/package/domod/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOMOD bool "domod" select BR2_PACKAGE_LIBUBUS_CPP - select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_JSON_C default n help This program is the main domo daemon. diff --git a/bsp/buildroot_external/package/domod/domod.mk b/bsp/buildroot_external/package/domod/domod.mk index 83261812..4c84ab12 100644 --- a/bsp/buildroot_external/package/domod/domod.mk +++ b/bsp/buildroot_external/package/domod/domod.mk @@ -10,12 +10,8 @@ DOMOD_SITE = $(TOPDIR)/../../src/prog/domod/builders/cmake DOMOD_SITE_METHOD = local DOMOD_INSTALL_STAGING = YES -DOMOD_DEPENDENCIES = libubus-cpp jsoncpp +DOMOD_DEPENDENCIES = libubus-cpp json-c -DOMOD_CONF = SRC_DIR=$(TOPDIR)/../.. - -DOMOD_CONF_ENV = $(DOMOD_CONF) -DOMOD_MAKE_ENV = $(DOMOD_CONF) -DOMOD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +DOMOD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(eval $(cmake-package)) diff --git a/bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk b/bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk index 951abf2f..aba7c736 100644 --- a/bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk +++ b/bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk @@ -12,10 +12,6 @@ LIBUBUS_CPP_INSTALL_STAGING = YES LIBUBUS_CPP_DEPENDENCIES = libubox ubus json-c -LIBUBUS_CPP_CONF = SRC_DIR=$(TOPDIR)/../.. - -LIBUBUS_CPP_CONF_ENV = $(LIBUBUS_CPP_CONF) -LIBUBUS_CPP_MAKE_ENV = $(LIBUBUS_CPP_CONF) -LIBUBUS_CPP_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +LIBUBUS_CPP_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(eval $(cmake-package)) diff --git a/projects/x86_64_domo/configs/buildroot_defconfig b/projects/x86_64_domo/configs/buildroot_defconfig index 93a5465b..61c8784a 100644 --- a/projects/x86_64_domo/configs/buildroot_defconfig +++ b/projects/x86_64_domo/configs/buildroot_defconfig @@ -23,5 +23,5 @@ BR2_ROOTFS_DEVICE_CREATION_STATIC=y BR2_ROOTFS_OVERLAY="$(BOARD)/ovl/" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR_BOARD)/scripts/post-build.sh" # BR2_PACKAGE_BUSYBOX is not set -BR2_PACKAGE_UBUS=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_DOMOD=y