rename zd1211 package to zd1211-driver

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1e1610c..c5dd05e 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=8
+PKG_RELEASE:=9

 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)

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

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


@@ -23,9 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
   TARGET:=-$(BOARD)-$(KERNEL)
 
 ifneq ($(DUMP),1)
   TARGET:=-$(BOARD)-$(KERNEL)

-  UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null}
-  UCLIBC_EXTRA_VERSION:=${shell cat $(STAGING_DIR)/uclibc_extra_version 2>/dev/null}
-  LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null}
+  LIBGCC_VERSION:=$(GCC_VERSION)

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


@@ -72,6 +70,7 @@ endef
 define Package/libgcc
   $(call Package/gcc/Default)
   TITLE:=GCC support library
 define Package/libgcc
   $(call Package/gcc/Default)
   TITLE:=GCC support library

+  DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN

 endef
 
 define Package/libssp
 endef
 
 define Package/libssp


@@ -79,12 +78,19 @@ define Package/libssp
   TITLE:=GCC support library
 endef
 
   TITLE:=GCC support library
 endef
 

+define Package/libstdcpp
+  $(call Package/gcc/Default)
+  NAME:=libstdc++
+  TITLE:=GNU Standard C++ Library v3
+  DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP
+endef
+

 define Package/uclibc/Default
   SECTION:=libs
   CATEGORY:=Base system
   DEPENDS:=@!NATIVE_TOOLCHAIN
   URL:=http://uclibc.org/
 define Package/uclibc/Default
   SECTION:=libs
   CATEGORY:=Base system
   DEPENDS:=@!NATIVE_TOOLCHAIN
   URL:=http://uclibc.org/

-  VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE)
+  VERSION:=$(UCLIBC_VERSION)$(UCLIBC_PATCHVER)-$(PKG_RELEASE)

 endef
 
 define Package/libpthread
 endef
 
 define Package/libpthread


@@ -110,6 +116,9 @@ endef
 
 define Package/base-files$(TARGET)/install
        $(CP) ./files/* $(1)/
 
 define Package/base-files$(TARGET)/install
        $(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)/; \
        fi
        if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
                $(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
        fi


@@ -119,7 +128,7 @@ define Package/base-files$(TARGET)/install
                fi; \
        fi
        $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
                fi; \
        fi
        $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner

-       $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
+       $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),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


@@ -147,38 +156,43 @@ endef
 
 define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib
 
 define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib

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

   endef
 endif
 
   endef
 endif
 

+define Package/libstdcpp/install
+       $(INSTALL_DIR) $(1)/lib
+       $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/lib/
+endef
+

 define Package/libpthread/install
        $(INSTALL_DIR) $(1)/lib
 define Package/libpthread/install
        $(INSTALL_DIR) $(1)/lib

-       $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/
-       $(CP) $(STAGING_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/
+       $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(UCLIBC_VERSION).so $(1)/lib/

 endef
 
 define Package/uclibc/install
        $(INSTALL_DIR) $(1)/lib
        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \
 endef
 
 define Package/uclibc/install
        $(INSTALL_DIR) $(1)/lib
        for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \

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

        done
 endef
 
 define Package/ldd/install
        $(INSTALL_DIR) $(1)/bin/
        done
 endef
 
 define Package/ldd/install
        $(INSTALL_DIR) $(1)/bin/

-       $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldd $(1)/bin/
+       $(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/

 endef
 
 define Package/ldconfig/install
        $(INSTALL_DIR) $(1)/bin/
 endef
 
 define Package/ldconfig/install
        $(INSTALL_DIR) $(1)/bin/

-       $(CP) $(TOOLCHAIN_BUILD_DIR)/uClibc-$(UCLIBC_EXTRA_VERSION)/utils/ldconfig $(1)/bin/
+       $(CP) $(TOOLCHAIN_DIR)/utils/ldconfig $(1)/bin/

 endef
 
 ifneq ($(DUMP),1)
 endef
 
 ifneq ($(DUMP),1)


@@ -188,5 +202,6 @@ endif
 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,base-files$(TARGET)))
 $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))

+$(eval $(call BuildPackage,libstdcpp))

 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))
 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))