simplify and fix adm5120 image building, fix broken FEATURES handling

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8d265f0..1c6cc05 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:=8
+PKG_RELEASE:=9

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


@@ -72,6 +72,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,6 +80,13 @@ 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
 define Package/uclibc/Default
   SECTION:=libs
   CATEGORY:=Base system


@@ -122,7 +130,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


@@ -160,6 +168,11 @@ ifeq ($(word 1,$(subst ., ,$(LIBGCC_VERSION))),4)
   endef
 endif
 
   endef
 endif
 

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

 define Package/libpthread/install
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/
 define Package/libpthread/install
        $(INSTALL_DIR) $(1)/lib
        $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(1)/lib/


@@ -191,5 +204,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))