X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Fimagebuilder%2Ffiles%2FMakefile;h=222dac43cc84d95326095c6289f0973cb9005216;hp=4d0f1fe1159124c44266579ba5dc590a846e9216;hb=eb1ca3677941beb3861fd6bb5144893d63241244;hpb=58d018731a6f6ae8e6956e8786c91c494b1f1bbd

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 4d0f1fe115..222dac43cc 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -126,23 +126,15 @@ package_index: FORCE
 package_install: FORCE
 	@echo
 	@echo Installing packages...
-	$(OPKG) install $(PACKAGE_DIR)/libc_*.ipk
-	$(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk
+	$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/libc_*.ipk $(PACKAGE_DIR)/base/libc_*.ipk))
+	$(OPKG) install $(firstword $(wildcard $(PACKAGE_DIR)/kernel_*.ipk $(PACKAGE_DIR)/base/kernel_*.ipk))
 	$(OPKG) install $(BUILD_PACKAGES)
 	rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*
 
 copy_files: FORCE
 	@echo
 	@echo Copying extra files
-	@( cd $(USER_FILES); find -type f ) | \
-		( cd $(TARGET_DIR); while :; do \
-			read FILE; \
-			[ -z "$$FILE" ] && break; \
-			[ -L "$$FILE" ] || continue; \
-			echo "Removing symlink $(TARGET_DIR)/$$FILE"; \
-			rm -f "$$FILE"; \
-		done; )
-	$(CP) $(USER_FILES)/* $(TARGET_DIR)/
+	@$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
 
 package_postinst: FORCE
 	@echo