Browse Source

imagebuilder: use correct package directory when bundling kmods and libc

The libc and kernel package files moved since the introduction of shared
packages and the changed output directory layout. This causes the generated
ImageBuilder archive to lack the necessary "libc" and "kernel" meta packages,
leading to opkg install errors later on.

Use the FeedPackageDir macro to figure out the proper source directory to use.

Signed-off-by: Jo-Philipp Wich <[email protected]>
Jo-Philipp Wich 9 years ago
parent
commit
b9466382b5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      target/imagebuilder/Makefile

+ 2 - 2
target/imagebuilder/Makefile

@@ -47,10 +47,10 @@ endif
 	$(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf
 	$(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf
 
 
 ifeq ($(CONFIG_IB_STANDALONE),)
 ifeq ($(CONFIG_IB_STANDALONE),)
-	(cd $(PACKAGE_DIR); $(FIND) -type f -name 'libc_*.ipk' -or -name 'kernel_*.ipk' -or -name 'kmod-*.ipk') | \
+	(cd $(call FeedPackageDir,libc); $(FIND) -type f -name 'libc_*.ipk' -or -name 'kernel_*.ipk' -or -name 'kmod-*.ipk') | \
 		while read path; do \
 		while read path; do \
 			mkdir -p "$(PKG_BUILD_DIR)/packages/$${path%/*}"; \
 			mkdir -p "$(PKG_BUILD_DIR)/packages/$${path%/*}"; \
-			cp "$(PACKAGE_DIR)/$$path" "$(PKG_BUILD_DIR)/packages/$$path"; \
+			cp "$(call FeedPackageDir,libc)/$$path" "$(PKG_BUILD_DIR)/packages/$$path"; \
 		done
 		done
 else
 else
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages
 	$(INSTALL_DIR) $(PKG_BUILD_DIR)/packages