X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=2180df3b37b0cef89c4f95d36c8c440bc6a68562;hb=c5a65a03735d00b756ad580d4ef829716295ff6a;hp=786edd49f00955ea114e80caad8347847a9b0f31;hpb=dd7c8797ec07fd310c0ae16536dab7ba13c31795;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/package/Makefile b/package/Makefile
index 786edd49f0..2180df3b37 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -64,6 +64,14 @@ endif
 $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
 	@-$(MAKE) package/preconfig
 	@if [ -d $(TOPDIR)/files ]; then \
+		( cd $(TOPDIR)/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) $(TOPDIR)/files/. $(TARGET_DIR); \
 	fi
 	@mkdir -p $(TARGET_DIR)/etc/rc.d
@@ -81,7 +89,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
 	$(call mklibs)
 
 $(curdir)/index: FORCE
-	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
 		gzip -9c Packages > Packages.gz \
 	)