restrict what's packaged in uclibc (prevent libuClibc++.so* from getting in), bump...

SVN-Revision: 2308

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index e0f83f76b3a481e0fa87b8b25ad44da6530c7bad..9a79d21c14b3169efbb2bb6cd174a6441323a657 100644 (file)
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 include $(TOPDIR)/package/rules.mk
@@ -55,9 +55,9 @@ $(IPKG_BASE):
 $(IPKG_LIBC):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(IDIR_LIBC)/lib
-       cp $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
-       for file in c crypt dl m nsl resolv rt uClibc util; do \
-               cp $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
+       for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+               cp -fpR $(STAGING_DIR)/lib/$$file.so.* $(IDIR_LIBC)/lib/; \
+               cp -fpR $(STAGING_DIR)/lib/$$file-$(LIBC_VERSION).so $(IDIR_LIBC)/lib/; \
        done
        -$(STRIP) $(IDIR_LIBC)/lib/*
        $(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)