Small bugfix for dependency handling - mostly for base-files and symlinks

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7c0a4c9..8d265f0 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -13,7 +13,7 @@ PKG_NAME:=base-files
 PKG_RELEASE:=8
 
 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),)
@@ -97,16 +97,6 @@ define Package/uclibc
   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
@@ -120,6 +110,9 @@ endef
 
 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
@@ -133,7 +126,7 @@ define Package/base-files$(TARGET)/install
        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
        mkdir -p $(1)/jffs
-       mkdir -p $(1)/lib
+       mkdir -p $(1)/lib/firmware
        mkdir -p $(1)/mnt
        mkdir -p $(1)/proc
        mkdir -p $(1)/tmp
@@ -200,6 +193,3 @@ $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libpthread))
 $(eval $(call BuildPackage,uclibc))
-$(eval $(call BuildPackage,ldd))
-$(eval $(call BuildPackage,ldconfig))
-