[source] build: fix triggering opkg/host compilation
LEDE Commits
lede-commits at lists.infradead.org
Wed Jan 18 17:44:12 PST 2017
jow pushed a commit to source.git, branch master:
https://git.lede-project.org/1fb673ee12cad775acf8cb89fc8608e8c3c457a2
commit 1fb673ee12cad775acf8cb89fc8608e8c3c457a2
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Jan 19 02:41:02 2017 +0100
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 <jo at mein.io>
---
package/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/Makefile b/package/Makefile
index 3cf500d..6929c47 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -57,7 +57,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
More information about the lede-commits
mailing list