add vif selection fix for the broadcom-wl wifi script (thx, sn9)

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1277de4..9f745aa 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=12
+PKG_RELEASE:=13

 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 


@@ -22,6 +22,9 @@ ifneq ($(DUMP),1)
     TARGET:=$(TARGET)-$(PROFILE)
   endif
   LIBGCC_VERSION:=$(GCC_VERSION)
     TARGET:=$(TARGET)-$(PROFILE)
   endif
   LIBGCC_VERSION:=$(GCC_VERSION)

+  ifeq ($(ARCH),x86_64)
+    LIB_SUFFIX:=64
+  endif

 else
   UCLIBC_VERSION:=<UCLIBC_VERSION>
   LIBGCC_VERSION:=<LIBGCC_VERSION>
 else
   UCLIBC_VERSION:=<UCLIBC_VERSION>
   LIBGCC_VERSION:=<LIBGCC_VERSION>


@@ -50,7 +53,6 @@ define Package/base-files$(TARGET)/conffiles
 /etc/passwd
 /etc/profile
 /etc/shells
 /etc/passwd
 /etc/profile
 /etc/shells

-/etc/ipkg.conf

 /etc/sysctl.conf
 $(call $(TARGET)/conffiles)
 endef
 /etc/sysctl.conf
 $(call $(TARGET)/conffiles)
 endef


@@ -75,6 +77,7 @@ endef
 
 define Package/libssp
 $(call Package/gcc/Default)
 
 define Package/libssp
 $(call Package/gcc/Default)

+  DEPENDS:=@SSP_SUPPORT

   TITLE:=GCC support library
 endef
 
   TITLE:=GCC support library
 endef
 


@@ -143,8 +146,8 @@ define Package/base-files$(TARGET)/install
                        $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
                fi \
        )
                        $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
                fi \
        )

+       $(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow)

        $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
        $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner

-       $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf

        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
        mkdir -p $(1)/jffs
        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
        mkdir -p $(1)/jffs


@@ -161,7 +164,7 @@ define Package/base-files$(TARGET)/install
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc

-       ln -sf /tmp/resolv.conf $(1)/etc/resolv.conf
+       ln -sf /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/

        $(call Package/base-files/install-target,$(1))
        for conffile in $(1)/etc/config/*; do \
                if [ -f "$$$$conffile" ]; then \
        $(call Package/base-files/install-target,$(1))
        for conffile in $(1)/etc/config/*; do \
                if [ -f "$$$$conffile" ]; then \


@@ -173,19 +176,19 @@ endef
 
 define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib
 
 define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libgcc_s.so.* $(1)/lib/

 endef
 
 ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
   define Package/libssp/install
        $(INSTALL_DIR) $(1)/lib
 endef
 
 ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
   define Package/libssp/install
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(TOOLCHAIN_DIR)/lib/libssp.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libssp.so.* $(1)/lib/

   endef
 endif
 
 define Package/libstdcpp/install
        $(INSTALL_DIR) $(1)/lib
   endef
 endif
 
 define Package/libstdcpp/install
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/lib/

 endef
 
 define Package/libpthread/install
 endef
 
 define Package/libpthread/install


@@ -196,7 +199,7 @@ endef
 
 define Package/uclibc/install
        $(INSTALL_DIR) $(1)/lib
 
 define Package/uclibc/install
        $(INSTALL_DIR) $(1)/lib

-       for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
+       for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \

                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
        done
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(1)/lib/; \
        done