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

update recipe to use workspace as root dir

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-04-16 18:02:08 +02:00
parent c7be80baf3
commit 3cdd67a4f2
14 changed files with 13 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/buildroot_external/Config.in
View File

@@ -72,6 +72,4 @@ endmenu # Domo
menu "Host tools" menu "Host tools"
source "$BR2_EXTERNAL_DOMO_PATH/package/virtfs-xattr/Config.in"
endmenu # Host tools endmenu # Host tools

6
bsp/buildroot_external/package/chacond/chacond.mk
View File

@@ -12,10 +12,6 @@ CHACOND_INSTALL_STAGING = YES
CHACOND_DEPENDENCIES = ubus json-c wiringpi CHACOND_DEPENDENCIES = ubus json-c wiringpi
CHACOND_CONF = SRC_DIR=$(TOPDIR)/../.. CHACOND_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
CHACOND_CONF_ENV = $(CHACOND_CONF)
CHACOND_MAKE_ENV = $(CHACOND_CONF)
CHACOND_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

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

@@ -10,10 +10,6 @@ LIBCIVETWEB_CPP_SITE = $(TOPDIR)/../../src/3P/civetweb/builders/cmake
LIBCIVETWEB_CPP_SITE_METHOD = local LIBCIVETWEB_CPP_SITE_METHOD = local
LIBCIVETWEB_CPP_INSTALL_STAGING = YES LIBCIVETWEB_CPP_INSTALL_STAGING = YES
LIBCIVETWEB_CPP_CONF = SRC_DIR=$(TOPDIR)/../.. LIBCIVETWEB_CPP_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
LIBCIVETWEB_CPP_CONF_ENV = $(LIBCIVETWEB_CPP_CONF)
LIBCIVETWEB_CPP_MAKE_ENV = $(LIBCIVETWEB_CPP_CONF)
LIBCIVETWEB_CPP_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

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

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
MOUNTD_VERSION:= 2015.11.22 MOUNTD_VERSION:= 2018.02.26
MOUNTD_SITE = $(TOPDIR)/../../src/3P/mountd/builders/cmake MOUNTD_SITE = $(TOPDIR)/../../src/3P/mountd/builders/cmake
MOUNTD_SITE_METHOD = local MOUNTD_SITE_METHOD = local
@@ -12,10 +12,6 @@ MOUNTD_INSTALL_STAGING = YES
MOUNTD_DEPENDENCIES = libubox uci MOUNTD_DEPENDENCIES = libubox uci
MOUNTD_CONF = SRC_DIR=$(TOPDIR)/../.. MOUNTD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
MOUNTD_CONF_ENV = $(MOUNTD_CONF)
MOUNTD_MAKE_ENV = $(MOUNTD_CONF)
MOUNTD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

4
bsp/buildroot_external/package/netifd/netifd.mk
View File

@@ -12,10 +12,10 @@ NETIFD_INSTALL_STAGING = YES
NETIFD_DEPENDENCIES = libubox json-c ubus uci libnl NETIFD_DEPENDENCIES = libubox json-c ubus uci libnl
NETIFD_CONF = SRC_DIR=$(TOPDIR)/../.. INC_DIR=$(WORKSPACE_DIR)buildroot/staging/usr/include NETIFD_CONF = INC_DIR=$(WORKSPACE_DIR)buildroot/staging/usr/include
NETIFD_CONF_ENV = $(NETIFD_CONF) NETIFD_CONF_ENV = $(NETIFD_CONF)
NETIFD_MAKE_ENV = $(NETIFD_CONF) NETIFD_MAKE_ENV = $(NETIFD_CONF)
NETIFD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) NETIFD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

4
bsp/buildroot_external/package/procd/procd.mk
View File

@@ -12,8 +12,6 @@ PROCD_INSTALL_STAGING = YES
PROCD_DEPENDENCIES = libubox ubus json-c PROCD_DEPENDENCIES = libubox ubus json-c
PROCD_CONF = SRC_DIR=$(TOPDIR)/../..
ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y) ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y)
PROCD_CONF_OPTS += -DDISABLE_INIT=ON PROCD_CONF_OPTS += -DDISABLE_INIT=ON
endif endif
@@ -24,6 +22,6 @@ endif
PROCD_CONF_ENV = $(PROCD_CONF) PROCD_CONF_ENV = $(PROCD_CONF)
PROCD_MAKE_ENV = $(PROCD_CONF) PROCD_MAKE_ENV = $(PROCD_CONF)
PROCD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) PROCD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

6
bsp/buildroot_external/package/restd/restd.mk
View File

@@ -12,10 +12,6 @@ RESTD_INSTALL_STAGING = YES
RESTD_DEPENDENCIES = libcivetweb-cpp RESTD_DEPENDENCIES = libcivetweb-cpp
RESTD_CONF = SRC_DIR=$(TOPDIR)/../.. RESTD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
RESTD_CONF_ENV = $(CHACOND_CONF)
RESTD_MAKE_ENV = $(CHACOND_CONF)
RESTD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

6
bsp/buildroot_external/package/sprinklerd/sprinklerd.mk
View File

@@ -12,10 +12,6 @@ SPRINKLERD_INSTALL_STAGING = YES
SPRINKLERD_DEPENDENCIES = libubus-cpp jsoncpp SPRINKLERD_DEPENDENCIES = libubus-cpp jsoncpp
SPRINKLERD_CONF = SRC_DIR=$(TOPDIR)/../.. SPRINKLERD_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
SPRINKLERD_CONF_ENV = $(SPRINKLERD_CONF)
SPRINKLERD_MAKE_ENV = $(SPRINKLERD_CONF)
SPRINKLERD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

6
bsp/buildroot_external/package/ubox/ubox.mk
View File

@@ -12,10 +12,6 @@ UBOX_INSTALL_STAGING = YES
UBOX_DEPENDENCIES = libubox ubus UBOX_DEPENDENCIES = libubox ubus
UBOX_CONF = SRC_DIR=$(TOPDIR)/../.. UBOX_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
UBOX_CONF_ENV = $(UBOX_CONF)
UBOX_MAKE_ENV = $(UBOX_CONF)
UBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

4
bsp/buildroot_external/package/uci/uci.mk
View File

@@ -16,8 +16,6 @@ UCI_CONF = SRC_DIR=$(TOPDIR)/../..
UCI_CONF_OPTS +=-DBUILD_LUA=OFF UCI_CONF_OPTS +=-DBUILD_LUA=OFF
UCI_CONF_ENV = $(UCI_CONF) UCI_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
UCI_MAKE_ENV = $(UCI_CONF)
UCI_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

4
bsp/buildroot_external/package/uclient/uclient.mk
View File

@@ -17,8 +17,6 @@ UCLIENT_CONF = SRC_DIR=$(TOPDIR)/../..
UCLIENT_CONF_OPTS +=-DBUILD_LUA=OFF UCLIENT_CONF_OPTS +=-DBUILD_LUA=OFF
UCLIENT_CONF_ENV = $(UCLIENT_CONF) UCLIENT_CONF_OPTS += -DworkspaceRoot=$(TOPDIR)/../.. -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
UCLIENT_MAKE_ENV = $(UCLIENT_CONF)
UCLIENT_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(cmake-package)) $(eval $(cmake-package))

6
bsp/buildroot_external/package/virtfs-xattr/Config.in
View File

@@ -1,6 +0,0 @@
config BR2_PACKAGE_HOST_VIRTFS_XATTR
bool "host virtfs-xattr"
default n
help
Utililty used to alter metadata of file in the target
directory, for sharing with 9p fsdev in qemu.

20
bsp/buildroot_external/package/virtfs-xattr/virtfs-xattr.mk
View File

@@ -1,20 +0,0 @@
################################################################################
#
# VIRTFS_XATTR
#
################################################################################
HOST_VIRTFS_XATTR_VERSION:= 1.0.0
HOST_VIRTFS_XATTR_SITE = $(TOPDIR)/../../src/tools/virtfs-xattr/builders/cmake
HOST_VIRTFS_XATTR_SITE_METHOD = local
HOST_VIRTFS_XATTR_DEPENDENCIES = host-attr
HOST_VIRTFS_XATTR_CONF = SRC_DIR=$(TOPDIR)/../..
HOST_VIRTFS_XATTR_CONF_ENV = $(HOST_VIRTFS_XATTR_CONF)
HOST_VIRTFS_XATTR_MAKE_ENV = $(HOST_VIRTFS_XATTR_CONF)
HOST_VIRTFS_XATTR_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
$(eval $(host-cmake-package))

2
bsp/include/buildroot.mk
View File

@@ -24,7 +24,7 @@ buildroot: buildroot.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET) $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET)
buildroot.shell: buildroot.config buildroot.shell: buildroot.config
$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ dirs outputmakefile $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ outputmakefile
$(eval export $(BR_ENV)) $(eval export $(BR_ENV))
cd $(BR_STAGING)/buildroot/; $(BR_ENV) bash cd $(BR_STAGING)/buildroot/; $(BR_ENV) bash