rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with buildroot

Browse Source
This commit is contained in:
jbnadal
2018-04-05 19:55:54 +02:00
parent 9df77ec9e3
commit 4f76e2485e
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.vscode/tasks.json vendored
View File

@@ -8,7 +8,7 @@
{ {
"label": "X86_64 - cmake - domod", "label": "X86_64 - cmake - domod",
"type": "shell", "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", "group": "build",
"options": { "options": {
"env": { "env": {
@@ -24,7 +24,7 @@
{ {
"label": "X86_64 - make - domod", "label": "X86_64 - make - domod",
"options": { "options": {
"cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domo", "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domod",
}, },
"type": "shell", "type": "shell",
"command": "make install", "command": "make install",
@@ -40,7 +40,7 @@
{ {
"label": "X86_64 - cmake - libubus-cpp", "label": "X86_64 - cmake - libubus-cpp",
"type": "shell", "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", "group": "build",
"options": { "options": {
"env": { "env": {
@@ -56,7 +56,7 @@
{ {
"label": "X86_64 - make - libubus-cpp", "label": "X86_64 - make - libubus-cpp",
"options": { "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", "type": "shell",
"command": "make install", "command": "make install",

2
bsp/buildroot_external/package/domod/Config.in
View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_DOMOD config BR2_PACKAGE_DOMOD
bool "domod" bool "domod"
select BR2_PACKAGE_LIBUBUS_CPP select BR2_PACKAGE_LIBUBUS_CPP
select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_JSON_C
default n default n
help help
This program is the main domo daemon. This program is the main domo daemon.

8
bsp/buildroot_external/package/domod/domod.mk
View File

@@ -10,12 +10,8 @@ DOMOD_SITE = $(TOPDIR)/../../src/prog/domod/builders/cmake
DOMOD_SITE_METHOD = local DOMOD_SITE_METHOD = local
DOMOD_INSTALL_STAGING = YES DOMOD_INSTALL_STAGING = YES
DOMOD_DEPENDENCIES = libubus-cpp jsoncpp DOMOD_DEPENDENCIES = libubus-cpp json-c
DOMOD_CONF = SRC_DIR=$(TOPDIR)/../.. DOMOD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
DOMOD_CONF_ENV = $(DOMOD_CONF)
DOMOD_MAKE_ENV = $(DOMOD_CONF)
DOMOD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

6
bsp/buildroot_external/package/libubus-cpp/libubus-cpp.mk
View File

@@ -12,10 +12,6 @@ LIBUBUS_CPP_INSTALL_STAGING = YES
LIBUBUS_CPP_DEPENDENCIES = libubox ubus json-c LIBUBUS_CPP_DEPENDENCIES = libubox ubus json-c
LIBUBUS_CPP_CONF = SRC_DIR=$(TOPDIR)/../.. LIBUBUS_CPP_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
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)
$(eval $(cmake-package)) $(eval $(cmake-package))

2
projects/x86_64_domo/configs/buildroot_defconfig
View File

@@ -23,5 +23,5 @@ BR2_ROOTFS_DEVICE_CREATION_STATIC=y
BR2_ROOTFS_OVERLAY="$(BOARD)/ovl/" BR2_ROOTFS_OVERLAY="$(BOARD)/ovl/"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR_BOARD)/scripts/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR_BOARD)/scripts/post-build.sh"
# BR2_PACKAGE_BUSYBOX is not set # BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_UBUS=y
# BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_DOMOD=y