[package] ppp: drop 402-use_uclibc_utils.patch, it breaks ip address conversion

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 786edd4..2180df3 100644 (file)
--- 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 \
 $(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
                $(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
        $(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 \
        )
 
                gzip -9c Packages > Packages.gz \
        )