[package] base-files:

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1433d34..ea2b5a4 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,41 +1,43 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=10
+PKG_RELEASE:=35

 
 

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

 
 

-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifeq ($(REV),)
-  REV:=0
-endif

 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)

-  TARGET:=-$(BOARD)-$(KERNEL)
+  TARGET:=-$(BOARD)
+  ifneq ($(wildcard $(PLATFORM_DIR)/base-files-$(PROFILE) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)),)
+    TARGET:=$(TARGET)-$(PROFILE)
+  endif

   LIBGCC_VERSION:=$(GCC_VERSION)
   LIBGCC_VERSION:=$(GCC_VERSION)

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

 else
 else

-  UCLIBC_VERSION:=<UCLIBC_VERSION>
+  LIBC_VERSION:=<LIBC_VERSION>

   LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 
   LIBGCC_VERSION:=<LIBGCC_VERSION>
 endif
 

-CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files)
-
-define Package/base-files$(TARGET)
+define Package/base-files

   SECTION:=base
   CATEGORY:=Base system
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/

-  VERSION:=$(PKG_RELEASE)-$(REV)
+  VERSION:=$(PKG_RELEASE)-$(REVISION)

   $(call Config,network.lan.proto,string,static,LAN Protocol)
   $(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
   $(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
   $(call Config,network.lan.proto,string,static,LAN Protocol)
   $(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
   $(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)


@@ -43,7 +45,7 @@ define Package/base-files$(TARGET)
   $(call Config,network.lan.dns,ip,,LAN DNS server)
 endef
 
   $(call Config,network.lan.dns,ip,,LAN DNS server)
 endef
 

-define Package/base-files$(TARGET)/conffiles
+define Package/base-files/conffiles

 /etc/banner
 /etc/hosts
 /etc/inittab
 /etc/banner
 /etc/hosts
 /etc/inittab


@@ -51,69 +53,251 @@ 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
 

-define Package/base-files$(TARGET)/description
+define Package/base-files/description

  This package contains a base filesystem and system scripts for OpenWrt.
 endef
 
  This package contains a base filesystem and system scripts for OpenWrt.
 endef
 

+

 define Package/gcc/Default
   SECTION:=libs
   CATEGORY:=Base system
 define Package/gcc/Default
   SECTION:=libs
   CATEGORY:=Base system

-  DEPENDS:=@!NATIVE_TOOLCHAIN

   URL:=http://gcc.gnu.org/
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
 endef
 
   URL:=http://gcc.gnu.org/
   VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
 endef
 

+

 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library
 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library

-  DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN
+  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire)
+endef
+
+define Package/libgcc/config
+       menu "Configuration"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+
+       config LIBGCC_ROOT_DIR
+               string
+               prompt "libgcc shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBGCC_FILE_SPEC
+               string
+               prompt "libgcc shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+               default "./lib/libgcc_s.so.*"
+
+       endmenu

 endef
 
 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
 

+define Package/libssp/config
+       menu "Configuration"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+
+       config LIBSPP_ROOT_DIR
+               string
+               prompt "libssp shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBSSP_FILE_SPEC
+               string
+               prompt "libssp shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               default "./lib/libssp.so.*"
+
+       endmenu
+endef
+
+

 define Package/libstdcpp
 $(call Package/gcc/Default)
   NAME:=libstdc++
   TITLE:=GNU Standard C++ Library v3
 define Package/libstdcpp
 $(call Package/gcc/Default)
   NAME:=libstdc++
   TITLE:=GNU Standard C++ Library v3

-  DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP
+  DEPENDS+=@INSTALL_LIBSTDCPP
+endef
+
+define Package/libstdcpp/config
+       menu "Configuration"
+       depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+
+       config LIBSTDCPP_ROOT_DIR
+               string
+               prompt "libstdcpp shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBSTDCPP_FILE_SPEC
+               string
+               prompt "libstdc++ shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+               default "./lib/libstdc++.so.*"
+
+       endmenu

 endef
 
 endef
 

-define Package/uclibc/Default
+
+define Package/libc/Default

   SECTION:=libs
   CATEGORY:=Base system
   SECTION:=libs
   CATEGORY:=Base system

-  DEPENDS:=@!NATIVE_TOOLCHAIN
-  URL:=http://uclibc.org/
-  VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE)
+  VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
+ifneq ($(TARGET_avr32)$(TARGET_coldfire),)
+  DEPENDS:=+libgcc
+endif
+  URL:=$(LIBC_URL)
+endef
+
+
+define Package/libc
+$(call Package/libc/Default)
+  TITLE:=C library
+endef
+
+define Package/libc/config
+       menu "Configuration"
+       depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+
+       config LIBC_ROOT_DIR
+               string
+               prompt "libc shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBC_FILE_SPEC
+               string
+               prompt "libc shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+               default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}"
+
+       endmenu

 endef
 
 endef
 

+

 define Package/libpthread
 define Package/libpthread

-$(call Package/uclibc/Default)
+$(call Package/libc/Default)

   TITLE:=POSIX thread library
   TITLE:=POSIX thread library

+  DEPENDS:= +librt
+endef
+
+define Package/libpthread/config
+       menu "Configuration"
+       depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+
+       config LIBPTHREAD_ROOT_DIR
+               string
+               prompt "libpthread shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBPTHREAD_FILE_SPEC
+               string
+               prompt "libpthread shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+               default "./lib/libpthread{-*.so,.so.*}"
+
+       endmenu
+endef
+
+
+define Package/librt
+$(call Package/libc/Default)
+  TITLE:=POSIX.1b RealTime extension library

 endef
 
 endef
 

-define Package/uclibc
-$(call Package/uclibc/Default)
-  TITLE:=C library embedded systems
+define Package/librt/config
+       menu "Configuration"
+       depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+
+       config LIBRT_ROOT_DIR
+               string
+               prompt "librt shared library base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LIBRT_FILE_SPEC
+               string
+               prompt "librt shared library files (use wildcards)"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+               default "./lib/librt{-*.so,.so.*}"
+
+       endmenu

 endef
 
 endef
 

+

 define Package/ldd
 define Package/ldd

-$(call Package/uclibc/Default)
+$(call Package/libc/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities

   TITLE:=LDD trace utility
 endef
 
   TITLE:=LDD trace utility
 endef
 

+define Package/ldd/config
+       menu "Configuration"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+
+       config LDD_ROOT_DIR
+               string
+               prompt "ldd trace utility base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LDD_FILE_SPEC
+               string
+               prompt "ldd trace utility file"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+               default "./usr/bin/ldd"
+
+       endmenu
+endef
+
+

 define Package/ldconfig
 define Package/ldconfig

-$(call Package/uclibc/Default)
+$(call Package/libc/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities

   TITLE:=Shared library path configuration
 endef
 
   TITLE:=Shared library path configuration
 endef
 

+define Package/ldconfig/config
+       menu "Configuration"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+
+       config LDCONFIG_ROOT_DIR
+               string
+               prompt "ldconfig base directory"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+               default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
+               default "/"  if NATIVE_TOOLCHAIN
+
+       config LDCONFIG_FILE_SPEC
+               string
+               prompt "ldconfig file"
+               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+               default "./sbin/ldconfig"
+
+       endmenu
+endef
+
+

 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
 endef


@@ -125,109 +309,228 @@ define Build/Compile
        $(call Build/Compile/Default)
 endef
 
        $(call Build/Compile/Default)
 endef
 

-define Package/base-files$(TARGET)/install
+define Package/base-files/install

        $(CP) ./files/* $(1)/
        if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
        fi
        $(CP) ./files/* $(1)/
        if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
        fi

-       if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
-               $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
+       if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+               $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
+       fi
+       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)), \
        fi
        $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \

-               if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
-                       $(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+               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 \
        )
                fi \
        )

-       if [ "$(PROFILE)" != "Default" ]; then \
-               if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
-                       $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
-               fi; \
-       fi
-       $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
-       $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
+# Form valid /etc/shadow entries, by copying the user:pw pairs
+# from /etc/passwd, and adding on pw change data
+       $(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS), \
+               cut -d ':' -f 1-2 $(1)/etc/passwd > $(1)/etc/shadow; \
+               $(SED) 's/$$$$/:13848:0:99999:7:::/' $(1)/etc/shadow \
+       )
+       $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
+       mkdir -p $(1)/CONTROL

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

+       mkdir -p $(1)/etc/rc.d

        mkdir -p $(1)/jffs
        mkdir -p $(1)/lib/firmware
        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
        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
        mkdir -p $(1)/usr/bin
        mkdir -p $(1)/sys
        mkdir -p $(1)/www

+       mkdir -p $(1)/root

        ln -sf /proc/mounts $(1)/etc/mtab
        rm -f $(1)/var
        ln -sf /tmp $(1)/var
        mkdir -p $(1)/etc
        ln -sf /proc/mounts $(1)/etc/mtab
        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 \

-                       grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+                       grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \

                                echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
                fi \
        done
 endef
 
                                echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
                fi \
        done
 endef
 

-define Package/libgcc/install
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+
+  define Package/libgcc/install

        $(INSTALL_DIR) $(1)/lib
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
-endef
+       $(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
   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
   endef

-endif

 
 

-define Package/libstdcpp/install
+  define Package/libstdcpp/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
+  endef
+
+  use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
+  use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
+  use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
+
+  define Package/glibc/install

        $(INSTALL_DIR) $(1)/lib
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
-endef
+       $(CP) $(TOOLCHAIN_DIR)/lib/ld*.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_SO_VERSION).so $(1)/lib/; \
+       done
+  endef
+
+  define Package/eglibc/install
+    $(call Package/glibc/install,$1)
+  endef
+
+  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_SO_VERSION).so $(1)/lib/; \
+       done
+  endef
+
+  define Package/libc/install
+    $(call Package/$(LIBC)/install,$1)
+  endef
+
+  define Package/libc/install_lib
+       $(CP) $(filter-out %/libdl_pic.a %/libpthread_pic.a %/libresolv_pic.a,$(wildcard $(TOOLCHAIN_DIR)/usr/lib/lib*.a)) $(1)/lib/
+       $(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/usr/lib/libc_so.a $(1)/lib/libc_pic.a)
+       $(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.map), \
+               $(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc_pic.a $(1)/lib/libgcc_s_pic.a; \
+               $(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.map $(1)/lib/libgcc_s_pic.map \
+       )
+  endef

 
 

-define Package/libpthread/install
+  define Package/libpthread/install

        $(INSTALL_DIR) $(1)/lib
        $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/

-       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/
-endef
+       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/
+  endef
+
+  define Package/libpthread/install_lib
+       $(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/libpthread_so.a),$(CP) $(TOOLCHAIN_DIR)/usr/lib/libpthread_so.a $(1)/lib/libpthread_pic.a)
+  endef

 
 

-define Package/uclibc/install
+  define Package/librt/install

        $(INSTALL_DIR) $(1)/lib
        $(INSTALL_DIR) $(1)/lib

-       for file in ld-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/; \
+       $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/
+  endef
+
+  define Package/ldd/install
+       $(INSTALL_DIR) $(1)/usr/bin/
+       $(CP) $(TOOLCHAIN_DIR)/usr/bin/ldd $(1)/usr/bin/
+  endef
+
+  define Package/ldconfig/install
+       $(INSTALL_DIR) $(1)/sbin/
+       $(CP) $(TOOLCHAIN_DIR)/sbin/ldconfig $(1)/sbin/
+  endef
+
+else
+
+  define Package/libgcc/install
+       for file in $(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \

        done
        done

-endef
+  endef

 
 

-define Package/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR)/lib
-        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
-                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(STAGING_DIR)/lib/; \
-                $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(UCLIBC_VERSION).so $(STAGING_DIR)/lib/; \
-        done
-endef
+  define Package/libssp/install
+       for file in $(call qstrip,$(CONFIG_LIBSSP_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBSSP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef

 
 

-define Package/ldd/install
-       $(INSTALL_DIR) $(1)/bin/
-       $(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/
-endef
+  define Package/libstdcpp/install
+       for file in $(call qstrip,$(CONFIG_LIBSTDCPP_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBSTDCPP_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef

 
 

-define Package/ldconfig/install
-       $(INSTALL_DIR) $(1)/bin/
-       $(CP) $(TOOLCHAIN_DIR)/target-utils/ldconfig $(1)/bin/
-endef
+  define Package/libc/install
+       for file in $(call qstrip,$(CONFIG_LIBC_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef
+
+  define Package/libpthread/install
+       for file in $(call qstrip,$(CONFIG_LIBPTHREAD_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBPTHREAD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef
+
+  define Package/librt/install
+       for file in $(call qstrip,$(CONFIG_LIBRT_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBRT_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef
+
+  define Package/ldd/install
+       for file in $(call qstrip,$(CONFIG_LDD_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LDD_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef
+
+  define Package/ldconfig/install
+       for file in $(call qstrip,$(CONFIG_LDCONFIG_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LDCONFIG_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done
+  endef
+
+endif

 
 ifneq ($(DUMP),1)
   -include $(PLATFORM_DIR)/base-files.mk
 endif
 
 
 ifneq ($(DUMP),1)
   -include $(PLATFORM_DIR)/base-files.mk
 endif
 

-$(eval $(call BuildPackage,base-files$(TARGET)))
+$(eval $(call BuildPackage,base-files))
+$(eval $(call BuildPackage,libc))

 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libstdcpp))
 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libstdcpp))
 $(eval $(call BuildPackage,libpthread))

-$(eval $(call BuildPackage,uclibc))
+$(eval $(call BuildPackage,librt))

 $(eval $(call BuildPackage,ldd))
 $(eval $(call BuildPackage,ldconfig))
 $(eval $(call BuildPackage,ldd))
 $(eval $(call BuildPackage,ldconfig))