From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 12 Apr 2016 23:46:09 +0000 (+0200)
Subject: imagebuilder: fix standalone operation
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=da46d2b228f67bf0ef89d7c4905c548918763f51;p=openwrt%2Fstaging%2Fwigyori.git

imagebuilder: fix standalone operation

Fix standalone ImageBuilders after the package layout rework.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 106ca3d6f2..87f91ce077 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -53,7 +53,8 @@ ifeq ($(CONFIG_IB_STANDALONE),)
 			cp "$(PACKAGE_DIR)/$$path" "$(PKG_BUILD_DIR)/packages/$$path"; \
 		done
 else
-	$(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
+	find $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.ipk' -exec $(CP) {} $(PKG_BUILD_DIR)/packages/ \;
 endif
 
 	$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/