From 3cdd67a4f27d25d7987cec5ab2bb171d5d8c0ddc Mon Sep 17 00:00:00 2001 From: NADAL Jean-Baptiste Date: Tue, 16 Apr 2019 18:02:08 +0200 Subject: [PATCH] update recipe to use workspace as root dir --- bsp/buildroot_external/Config.in | 2 -- .../package/chacond/chacond.mk | 6 +----- .../libcivetweb-cpp/libcivetweb-cpp.mk | 6 +----- .../package/mountd/mountd.mk | 8 ++------ .../package/netifd/netifd.mk | 4 ++-- bsp/buildroot_external/package/procd/procd.mk | 4 +--- bsp/buildroot_external/package/restd/restd.mk | 6 +----- .../package/sprinklerd/sprinklerd.mk | 6 +----- bsp/buildroot_external/package/ubox/ubox.mk | 6 +----- bsp/buildroot_external/package/uci/uci.mk | 4 +--- .../package/uclient/uclient.mk | 4 +--- .../package/virtfs-xattr/Config.in | 6 ------ .../package/virtfs-xattr/virtfs-xattr.mk | 20 ------------------- bsp/include/buildroot.mk | 2 +- 14 files changed, 13 insertions(+), 71 deletions(-) delete mode 100644 bsp/buildroot_external/package/virtfs-xattr/Config.in delete mode 100644 bsp/buildroot_external/package/virtfs-xattr/virtfs-xattr.mk diff --git a/bsp/buildroot_external/Config.in b/bsp/buildroot_external/Config.in index 0d4c3e24..e93e5009 100644 --- a/bsp/buildroot_external/Config.in +++ b/bsp/buildroot_external/Config.in @@ -72,6 +72,4 @@ endmenu # Domo menu "Host tools" -source "$BR2_EXTERNAL_DOMO_PATH/package/virtfs-xattr/Config.in" - endmenu # Host tools diff --git a/bsp/buildroot_external/package/chacond/chacond.mk b/bsp/buildroot_external/package/chacond/chacond.mk index b389ed1c..9c820b93 100644 --- a/bsp/buildroot_external/package/chacond/chacond.mk +++ b/bsp/buildroot_external/package/chacond/chacond.mk @@ -12,10 +12,6 @@ CHACOND_INSTALL_STAGING = YES CHACOND_DEPENDENCIES = ubus json-c wiringpi -CHACOND_CONF = SRC_DIR=$(TOPDIR)/../.. - -CHACOND_CONF_ENV = $(CHACOND_CONF) -CHACOND_MAKE_ENV = $(CHACOND_CONF) -CHACOND_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +CHACOND_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/libcivetweb-cpp/libcivetweb-cpp.mk b/bsp/buildroot_external/package/libcivetweb-cpp/libcivetweb-cpp.mk index fdd8964e..5b1567eb 100644 --- a/bsp/buildroot_external/package/libcivetweb-cpp/libcivetweb-cpp.mk +++ b/bsp/buildroot_external/package/libcivetweb-cpp/libcivetweb-cpp.mk @@ -10,10 +10,6 @@ LIBCIVETWEB_CPP_SITE = $(TOPDIR)/../../src/3P/civetweb/builders/cmake LIBCIVETWEB_CPP_SITE_METHOD = local LIBCIVETWEB_CPP_INSTALL_STAGING = YES -LIBCIVETWEB_CPP_CONF = SRC_DIR=$(TOPDIR)/../.. - -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) +LIBCIVETWEB_CPP_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/mountd/mountd.mk b/bsp/buildroot_external/package/mountd/mountd.mk index 38ea4857..48f166b5 100644 --- a/bsp/buildroot_external/package/mountd/mountd.mk +++ b/bsp/buildroot_external/package/mountd/mountd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOUNTD_VERSION:= 2015.11.22 +MOUNTD_VERSION:= 2018.02.26 MOUNTD_SITE = $(TOPDIR)/../../src/3P/mountd/builders/cmake MOUNTD_SITE_METHOD = local @@ -12,10 +12,6 @@ MOUNTD_INSTALL_STAGING = YES MOUNTD_DEPENDENCIES = libubox uci -MOUNTD_CONF = SRC_DIR=$(TOPDIR)/../.. - -MOUNTD_CONF_ENV = $(MOUNTD_CONF) -MOUNTD_MAKE_ENV = $(MOUNTD_CONF) -MOUNTD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +MOUNTD_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/netifd/netifd.mk b/bsp/buildroot_external/package/netifd/netifd.mk index 4154f8db..d1dfdae5 100644 --- a/bsp/buildroot_external/package/netifd/netifd.mk +++ b/bsp/buildroot_external/package/netifd/netifd.mk @@ -12,10 +12,10 @@ NETIFD_INSTALL_STAGING = YES 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_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)) diff --git a/bsp/buildroot_external/package/procd/procd.mk b/bsp/buildroot_external/package/procd/procd.mk index 9c399fba..7b3d05c5 100644 --- a/bsp/buildroot_external/package/procd/procd.mk +++ b/bsp/buildroot_external/package/procd/procd.mk @@ -12,8 +12,6 @@ PROCD_INSTALL_STAGING = YES PROCD_DEPENDENCIES = libubox ubus json-c -PROCD_CONF = SRC_DIR=$(TOPDIR)/../.. - ifeq ($(BR2_PACKAGE_PROCD_DISABLE_INIT),y) PROCD_CONF_OPTS += -DDISABLE_INIT=ON endif @@ -24,6 +22,6 @@ endif PROCD_CONF_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)) diff --git a/bsp/buildroot_external/package/restd/restd.mk b/bsp/buildroot_external/package/restd/restd.mk index 91009132..9174f404 100644 --- a/bsp/buildroot_external/package/restd/restd.mk +++ b/bsp/buildroot_external/package/restd/restd.mk @@ -12,10 +12,6 @@ RESTD_INSTALL_STAGING = YES RESTD_DEPENDENCIES = libcivetweb-cpp -RESTD_CONF = SRC_DIR=$(TOPDIR)/../.. - -RESTD_CONF_ENV = $(CHACOND_CONF) -RESTD_MAKE_ENV = $(CHACOND_CONF) -RESTD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +RESTD_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/sprinklerd/sprinklerd.mk b/bsp/buildroot_external/package/sprinklerd/sprinklerd.mk index c506c6d5..0bcab5e9 100644 --- a/bsp/buildroot_external/package/sprinklerd/sprinklerd.mk +++ b/bsp/buildroot_external/package/sprinklerd/sprinklerd.mk @@ -12,10 +12,6 @@ SPRINKLERD_INSTALL_STAGING = YES SPRINKLERD_DEPENDENCIES = libubus-cpp jsoncpp -SPRINKLERD_CONF = SRC_DIR=$(TOPDIR)/../.. - -SPRINKLERD_CONF_ENV = $(SPRINKLERD_CONF) -SPRINKLERD_MAKE_ENV = $(SPRINKLERD_CONF) -SPRINKLERD_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +SPRINKLERD_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/ubox/ubox.mk b/bsp/buildroot_external/package/ubox/ubox.mk index 164296b5..5e12c70f 100644 --- a/bsp/buildroot_external/package/ubox/ubox.mk +++ b/bsp/buildroot_external/package/ubox/ubox.mk @@ -12,10 +12,6 @@ UBOX_INSTALL_STAGING = YES UBOX_DEPENDENCIES = libubox ubus -UBOX_CONF = SRC_DIR=$(TOPDIR)/../.. - -UBOX_CONF_ENV = $(UBOX_CONF) -UBOX_MAKE_ENV = $(UBOX_CONF) -UBOX_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +UBOX_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/uci/uci.mk b/bsp/buildroot_external/package/uci/uci.mk index b26d70bf..fff6cfce 100644 --- a/bsp/buildroot_external/package/uci/uci.mk +++ b/bsp/buildroot_external/package/uci/uci.mk @@ -16,8 +16,6 @@ UCI_CONF = SRC_DIR=$(TOPDIR)/../.. UCI_CONF_OPTS +=-DBUILD_LUA=OFF -UCI_CONF_ENV = $(UCI_CONF) -UCI_MAKE_ENV = $(UCI_CONF) -UCI_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +UCI_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/uclient/uclient.mk b/bsp/buildroot_external/package/uclient/uclient.mk index c6bf40d8..645d1c84 100644 --- a/bsp/buildroot_external/package/uclient/uclient.mk +++ b/bsp/buildroot_external/package/uclient/uclient.mk @@ -17,8 +17,6 @@ UCLIENT_CONF = SRC_DIR=$(TOPDIR)/../.. UCLIENT_CONF_OPTS +=-DBUILD_LUA=OFF -UCLIENT_CONF_ENV = $(UCLIENT_CONF) -UCLIENT_MAKE_ENV = $(UCLIENT_CONF) -UCLIENT_CONF_OPTS += -DMODULE_PATH=$(TOPDIR)/../../bsp/cmake-modules -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) +UCLIENT_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/virtfs-xattr/Config.in b/bsp/buildroot_external/package/virtfs-xattr/Config.in deleted file mode 100644 index e2a31085..00000000 --- a/bsp/buildroot_external/package/virtfs-xattr/Config.in +++ /dev/null @@ -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. diff --git a/bsp/buildroot_external/package/virtfs-xattr/virtfs-xattr.mk b/bsp/buildroot_external/package/virtfs-xattr/virtfs-xattr.mk deleted file mode 100644 index 9969d2a1..00000000 --- a/bsp/buildroot_external/package/virtfs-xattr/virtfs-xattr.mk +++ /dev/null @@ -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)) diff --git a/bsp/include/buildroot.mk b/bsp/include/buildroot.mk index f3cba938..23be6f9c 100644 --- a/bsp/include/buildroot.mk +++ b/bsp/include/buildroot.mk @@ -24,7 +24,7 @@ buildroot: buildroot.config $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET) 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)) cd $(BR_STAGING)/buildroot/; $(BR_ENV) bash