prevent madwifi from building on UML

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index dfbfd60..c639df8 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
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
@@ -71,7 +71,7 @@ endef
 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN
+  DEPENDS:=@!TARGET_avr32 @!NATIVE_TOOLCHAIN
 endef
 
 define Package/libssp
@@ -104,6 +104,16 @@ $(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
@@ -123,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)/; \
@@ -141,6 +156,7 @@ define Package/base-files$(TARGET)/install
        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
@@ -188,12 +204,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)
@@ -206,3 +222,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))