get rid of per-profile base-files
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 29 Sep 2007 14:27:54 +0000 (14:27 +0000)
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 29 Sep 2007 14:27:54 +0000 (14:27 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9069 3c298f89-4303-0410-b956-a3cf2f4a3e73

33 files changed:
package/base-files/Makefile
target/linux/adm5120/base-files/etc/diag.sh [moved from target/linux/adm5120/base-files/default/etc/diag.sh with 100% similarity]
target/linux/adm5120/base-files/lib/adm5120.sh [moved from target/linux/adm5120/base-files/default/lib/adm5120.sh with 100% similarity]
target/linux/adm5120/router_le/base-files/sbin/wget2nand [moved from target/linux/adm5120/router_le/base-files/default/sbin/wget2nand with 100% similarity]
target/linux/amazon/base-files/etc/config/network [moved from target/linux/amazon/base-files/default/etc/config/network with 100% similarity]
target/linux/amcc/base-files/etc/inittab [moved from target/linux/amcc/base-files/default/etc/inittab with 100% similarity]
target/linux/ar7/base-files/etc/config/network [moved from target/linux/ar7/base-files/default/etc/config/network with 100% similarity]
target/linux/ar7/base-files/etc/diag.sh [moved from target/linux/ar7/base-files/default/etc/diag.sh with 100% similarity]
target/linux/ar7/base-files/etc/init.d/adam2 [moved from target/linux/ar7/base-files/default/etc/init.d/adam2 with 100% similarity]
target/linux/at91/base-files/etc/inittab [moved from target/linux/at91/base-files/default/etc/inittab with 100% similarity]
target/linux/at91/base-files/etc/ipkg.conf [moved from target/linux/at91/base-files/default/etc/ipkg.conf with 100% similarity]
target/linux/atheros/base-files/etc/preinit.arch [moved from target/linux/atheros/base-files/default/etc/preinit.arch with 100% similarity]
target/linux/au1000/base-files/etc/diag.sh [moved from target/linux/au1000/base-files/default/etc/diag.sh with 100% similarity]
target/linux/brcm-2.4/base-files/etc/diag.sh [moved from target/linux/brcm-2.4/base-files/default/etc/diag.sh with 100% similarity]
target/linux/brcm-2.4/base-files/etc/init.d/netconfig [moved from target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig with 100% similarity]
target/linux/brcm-2.4/base-files/etc/preinit.arch [moved from target/linux/brcm-2.4/base-files/default/etc/preinit.arch with 100% similarity]
target/linux/brcm-2.4/base-files/lib/upgrade/platform.sh [moved from target/linux/brcm-2.4/base-files/default/lib/upgrade/platform.sh with 100% similarity]
target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe [moved from target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe with 100% similarity]
target/linux/etrax/base-files/etc/config/network [moved from target/linux/etrax/base-files/default/etc/config/network with 100% similarity]
target/linux/etrax/base-files/etc/ipkg.conf [moved from target/linux/etrax/base-files/default/etc/ipkg.conf with 100% similarity]
target/linux/etrax/base-files/etc/passwd [moved from target/linux/etrax/base-files/default/etc/passwd with 100% similarity]
target/linux/iop32x/base-files/etc/config/network [moved from target/linux/iop32x/base-files/default/etc/config/network with 100% similarity]
target/linux/ixp4xx/base-files/etc/config/network [moved from target/linux/ixp4xx/base-files/default/etc/config/network with 100% similarity]
target/linux/rb532/base-files/etc/config/network [moved from target/linux/rb532/base-files/default/etc/config/network with 100% similarity]
target/linux/rb532/base-files/etc/diag.sh [moved from target/linux/rb532/base-files/default/etc/diag.sh with 100% similarity]
target/linux/rb532/base-files/sbin/cf2nand [moved from target/linux/rb532/base-files/default/sbin/cf2nand with 100% similarity]
target/linux/rb532/base-files/sbin/wget2nand [moved from target/linux/rb532/base-files/default/sbin/wget2nand with 100% similarity]
target/linux/rdc/base-files/etc/diag.sh [moved from target/linux/rdc/base-files/default/etc/diag.sh with 100% similarity]
target/linux/rdc/base-files/etc/inittab [moved from target/linux/rdc/base-files/default/etc/inittab with 100% similarity]
target/linux/sibyte/base-files/etc/config/network [moved from target/linux/sibyte/base-files/default/etc/config/network with 100% similarity]
target/linux/sibyte/base-files/etc/inittab [moved from target/linux/sibyte/base-files/default/etc/inittab with 100% similarity]
target/linux/x86/base-files/etc/preinit.arch [moved from target/linux/x86/base-files/default/etc/preinit.arch with 100% similarity]
target/linux/x86/base-files/lib/upgrade/platform.sh [moved from target/linux/x86/base-files/default/lib/upgrade/platform.sh with 100% similarity]

index d81ec4f1c4ae78b5d9ec0ee603c323f11a470a9f..f5bf1adce74419c3f0a46c050425dc421624649b 100644 (file)
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -130,19 +130,14 @@ define Package/base-files$(TARGET)/install
        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)/; \
+       if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+               $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
        fi
        $(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
-               if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
-                       $(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+               if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+                       $(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
                fi \
        )
-       if [ "$(PROFILE)" != "Default" ]; then \
-               if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
-                       $(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
-               fi; \
-       fi
        $(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
        $(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
        mkdir -p $(1)/dev