From: Jo-Philipp Wich Date: Thu, 19 Jan 2017 01:41:02 +0000 (+0100) Subject: build: fix triggering opkg/host compilation X-Git-Tag: v17.01.1~12 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6e79980b87e918fec5020bf91207ef51c24924d;p=openwrt%2Fstaging%2Fchunkeey.git build: fix triggering opkg/host compilation Commit 131db36 "build: remove separate /install step for host builds" dropped the package/*/host/install targets in favor to performing the install steps within the compile target instead. Adjust package/Makefile accordingly in order to prevent a missing staging_dir/host/bin/opkg when staging package archives into the rootfs. Signed-off-by: Jo-Philipp Wich --- diff --git a/package/Makefile b/package/Makefile index 3250e7b7d0..cc1e9d4b66 100644 --- a/package/Makefile +++ b/package/Makefile @@ -56,7 +56,7 @@ $(curdir)/merge: $(curdir)/merge-index: $(curdir)/merge (cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; ) -$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/install $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) +$(curdir)/install: $(TMP_DIR)/.build $(curdir)/system/opkg/host/compile $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) [ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp