X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/17c7b6c3fdc48301e50d22cc6138ede16bd1be24..e7c233e67e59de139afd7b25fc590513a5563ddd:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9acb8dfd9..313710187 100644
--- 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
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
@@ -34,8 +34,6 @@ define Package/base-files$(TARGET)
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=Base filesystem for OpenWrt
-  DESCRIPTION:=\
-	This package contains a base filesystem and system scripts for OpenWrt.
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REV)
   $(call Config,network.lan.proto,string,static,LAN Protocol)
@@ -58,6 +56,10 @@ define Package/base-files$(TARGET)/conffiles
 $(call $(TARGET)/conffiles)
 endef
 
+define Package/base-files$(TARGET)/description
+ This package contains a base filesystem and system scripts for OpenWrt.
+endef
+
 define Package/gcc/Default
   SECTION:=libs
   CATEGORY:=Base system
@@ -67,18 +69,18 @@ define Package/gcc/Default
 endef
 
 define Package/libgcc
-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN
+  DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN
 endef
 
 define Package/libssp
-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)
   TITLE:=GCC support library
 endef
 
 define Package/libstdcpp
-  $(call Package/gcc/Default)
+$(call Package/gcc/Default)
   NAME:=libstdc++
   TITLE:=GNU Standard C++ Library v3
   DEPENDS:=@!NATIVE_TOOLCHAIN&&@INSTALL_LIBSTDCPP
@@ -93,15 +95,25 @@ define Package/uclibc/Default
 endef
 
 define Package/libpthread
-  $(call Package/uclibc/Default)
+$(call Package/uclibc/Default)
   TITLE:=POSIX thread library
 endef
 
 define Package/uclibc
-  $(call Package/uclibc/Default)
+$(call Package/uclibc/Default)
   TITLE:=C library embedded systems
 endef
 
+define Package/ldd
+$(call Package/uclibc/Default)
+  TITLE:=LDD trace utility
+endef
+
+define Package/ldconfig
+$(call Package/uclibc/Default)
+  TITLE:=Shared library path configuration
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
@@ -121,6 +133,11 @@ define Package/base-files$(TARGET)/install
 	if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
 		$(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
 	fi
+	$(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
+		if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+		fi \
+	)
 	if [ "$(PROFILE)" != "Default" ]; then \
 		if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
 			$(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
@@ -186,12 +203,12 @@ endef
 
 define Package/ldd/install
 	$(INSTALL_DIR) $(1)/bin/
-	$(CP) $(TOOLCHAIN_DIR)/utils/ldd $(1)/bin/
+	$(CP) $(TOOLCHAIN_DIR)/target-utils/ldd $(1)/bin/
 endef
 
 define Package/ldconfig/install
 	$(INSTALL_DIR) $(1)/bin/
-	$(CP) $(TOOLCHAIN_DIR)/utils/ldconfig $(1)/bin/
+	$(CP) $(TOOLCHAIN_DIR)/target-utils/ldconfig $(1)/bin/
 endef
 
 ifneq ($(DUMP),1)
@@ -204,3 +221,5 @@ $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libstdcpp))
 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))
+$(eval $(call BuildPackage,ldd))
+$(eval $(call BuildPackage,ldconfig))