From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 9 Aug 2014 12:11:34 +0000 (+0000)
Subject: BB: build: consider sub-directories when deploying packages to image with CONFIG_PER_... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2148416281f9a0a0f5e7c6b7db25367f4c5c721e;p=openwrt%2Fsvn-archive%2Fopenwrt.git

BB: build: consider sub-directories when deploying packages to image with CONFIG_PER_FEED_REPO (#17430)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Backport of r42041

SVN-Revision: 42089
---

diff --git a/package/Makefile b/package/Makefile
index bf1b16fc9a..0cba878576 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -94,7 +94,7 @@ $(curdir)/install: $(TMP_DIR)/.build
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
 	rm -rf $(TARGET_DIR)
 	[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-	@$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
+	@$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)$(if $(CONFIG_PER_FEED_REPO),/*)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
 	@for file in $(PACKAGE_INSTALL_FILES); do \
 		[ -s $$file.flags ] || continue; \
 		for flag in `cat $$file.flags`; do \