refresh patches

[openwrt/svn-archive/archive.git] / package / base-files / Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 440562b877304012a8da6dd188d79d99ecc9a9d5..fb7debf96c4ee36f492877b7d0a1ae301109cdd9 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=18
+PKG_RELEASE:=26
 
-PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
+PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,15 +24,14 @@ ifneq ($(DUMP),1)
   ifeq ($(ARCH),x86_64)
     LIB_SUFFIX:=64
   endif
+  ifneq ($(findstring mips64,$(ARCH)),)
+    LIB_SUFFIX:=64
+  endif
 else
   LIBC_VERSION:=<LIBC_VERSION>
   LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 
-ifneq ($(LIBC_VERSION),0.9.28)
-  LIBC_VERSION:=$(LIBC_VERSION)$(LIBC_PATCHVER)
-endif
-
 CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
 
 define Package/base-files$(TARGET)
@@ -75,7 +74,7 @@ endef
 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS+=@!TARGET_avr32
+  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire)
 endef
 
 define Package/libssp
@@ -152,12 +151,18 @@ define Package/base-files$(TARGET)/install
        if [ -d $(PLATFORM_DIR)/base-files-$(PROFILE)/. ]; then \
                $(CP) $(PLATFORM_DIR)/base-files-$(PROFILE)/* $(1)/; \
        fi
+       if [ -d $(PLATFORM_DIR)/$(PROFILE)/base-files/. ]; then \
+               $(CP) $(PLATFORM_DIR)/$(PROFILE)/base-files/* $(1)/; \
+       fi
        $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
                if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
                        $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
                fi; \
                if [ -d $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/. ]; then \
                        $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
+               fi; \
+               if [ -d $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/. ]; then \
+                       $(CP) $(PLATFORM_SUBDIR)/$(PROFILE)/base-files/* $(1)/; \
                fi \
        )
 # Form valid /etc/shadow entries, by copying the user:pw pairs
@@ -170,12 +175,15 @@ define Package/base-files$(TARGET)/install
        mkdir -p $(1)/CONTROL
        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
+       mkdir -p $(1)/etc/rc.d
        mkdir -p $(1)/jffs
        mkdir -p $(1)/lib/firmware
+       $(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX))
        mkdir -p $(1)/mnt
        mkdir -p $(1)/proc
        mkdir -p $(1)/tmp
        mkdir -p $(1)/usr/lib
+       $(if $(LIB_SUFFIX),-ln -s lib $(1)/usr/lib$(LIB_SUFFIX))
        mkdir -p $(1)/usr/bin
        mkdir -p $(1)/sys
        mkdir -p $(1)/www
@@ -216,10 +224,10 @@ use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),lib
 define Package/glibc/install
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
-       $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).so $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so $(1)/lib/
        for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
-               $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+               $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
        done
 endef
 
@@ -231,7 +239,7 @@ define Package/uClibc/install
        $(INSTALL_DIR) $(1)/lib
        for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
-               $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
+               $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \
        done
 endef
 
@@ -239,16 +247,20 @@ define Package/libc/install
 $(call Package/$(LIBC)/install,$1)
 endef
 
+define Package/libc/install_lib
+       $(CP) $(filter-out %/libdl_pic.a,$(wildcard $(TOOLCHAIN_DIR)/usr/lib/lib*.a)) $(1)/lib/
+endef
+
 define Package/libpthread/install
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
-       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_VERSION).so $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/
 endef
 
 define Package/librt/install
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/
-       $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_VERSION).so $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/
 endef
 
 define Package/ldd/install