get rid of per-profile base-files

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9069 3c298f89-4303-0410-b956-a3cf2f4a3e73

33 files changed, 6 insertions, 11 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d81ec4f1c..f5bf1adce 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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
diff --git a/target/linux/adm5120/base-files/default/etc/diag.sh b/target/linux/adm5120/base-files/etc/diag.sh
index 3d5d9d84a..3d5d9d84a 100755
--- a/target/linux/adm5120/base-files/default/etc/diag.sh
+++ b/target/linux/adm5120/base-files/etc/diag.sh
diff --git a/target/linux/adm5120/base-files/default/lib/adm5120.sh b/target/linux/adm5120/base-files/lib/adm5120.sh
index d599a09b1..d599a09b1 100755
--- a/target/linux/adm5120/base-files/default/lib/adm5120.sh
+++ b/target/linux/adm5120/base-files/lib/adm5120.sh
diff --git a/target/linux/adm5120/router_le/base-files/default/sbin/wget2nand b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
index adb56b946..adb56b946 100755
--- a/target/linux/adm5120/router_le/base-files/default/sbin/wget2nand
+++ b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
diff --git a/target/linux/amazon/base-files/default/etc/config/network b/target/linux/amazon/base-files/etc/config/network
index 72e39f88a..72e39f88a 100644
--- a/target/linux/amazon/base-files/default/etc/config/network
+++ b/target/linux/amazon/base-files/etc/config/network
diff --git a/target/linux/amcc/base-files/default/etc/inittab b/target/linux/amcc/base-files/etc/inittab
index 859dc530c..859dc530c 100644
--- a/target/linux/amcc/base-files/default/etc/inittab
+++ b/target/linux/amcc/base-files/etc/inittab
diff --git a/target/linux/ar7/base-files/default/etc/config/network b/target/linux/ar7/base-files/etc/config/network
index 5fa112cc6..5fa112cc6 100644
--- a/target/linux/ar7/base-files/default/etc/config/network
+++ b/target/linux/ar7/base-files/etc/config/network
diff --git a/target/linux/ar7/base-files/default/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh
index 22acc71ab..22acc71ab 100644
--- a/target/linux/ar7/base-files/default/etc/diag.sh
+++ b/target/linux/ar7/base-files/etc/diag.sh
diff --git a/target/linux/ar7/base-files/default/etc/init.d/adam2 b/target/linux/ar7/base-files/etc/init.d/adam2
index 6b786270e..6b786270e 100755
--- a/target/linux/ar7/base-files/default/etc/init.d/adam2
+++ b/target/linux/ar7/base-files/etc/init.d/adam2
diff --git a/target/linux/at91/base-files/default/etc/inittab b/target/linux/at91/base-files/etc/inittab
index a627ce5ff..a627ce5ff 100644
--- a/target/linux/at91/base-files/default/etc/inittab
+++ b/target/linux/at91/base-files/etc/inittab
diff --git a/target/linux/at91/base-files/default/etc/ipkg.conf b/target/linux/at91/base-files/etc/ipkg.conf
index 10c4f67c6..10c4f67c6 100644
--- a/target/linux/at91/base-files/default/etc/ipkg.conf
+++ b/target/linux/at91/base-files/etc/ipkg.conf
diff --git a/target/linux/atheros/base-files/default/etc/preinit.arch b/target/linux/atheros/base-files/etc/preinit.arch
index 7e911ab2a..7e911ab2a 100755
--- a/target/linux/atheros/base-files/default/etc/preinit.arch
+++ b/target/linux/atheros/base-files/etc/preinit.arch
diff --git a/target/linux/au1000/base-files/default/etc/diag.sh b/target/linux/au1000/base-files/etc/diag.sh
index d97461532..d97461532 100644
--- a/target/linux/au1000/base-files/default/etc/diag.sh
+++ b/target/linux/au1000/base-files/etc/diag.sh
diff --git a/target/linux/brcm-2.4/base-files/default/etc/diag.sh b/target/linux/brcm-2.4/base-files/etc/diag.sh
index 3b08554c6..3b08554c6 100644
--- a/target/linux/brcm-2.4/base-files/default/etc/diag.sh
+++ b/target/linux/brcm-2.4/base-files/etc/diag.sh
diff --git a/target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index 643ba35d3..643ba35d3 100755
--- a/target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch b/target/linux/brcm-2.4/base-files/etc/preinit.arch
index 43df591ab..43df591ab 100755
--- a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch
+++ b/target/linux/brcm-2.4/base-files/etc/preinit.arch
diff --git a/target/linux/brcm-2.4/base-files/default/lib/upgrade/platform.sh b/target/linux/brcm-2.4/base-files/lib/upgrade/platform.sh
index ac53b9d59..ac53b9d59 100644
--- a/target/linux/brcm-2.4/base-files/default/lib/upgrade/platform.sh
+++ b/target/linux/brcm-2.4/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe b/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe
index 0544339de..0544339de 100755
--- a/target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe
+++ b/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe
diff --git a/target/linux/etrax/base-files/default/etc/config/network b/target/linux/etrax/base-files/etc/config/network
index b3632fd06..b3632fd06 100644
--- a/target/linux/etrax/base-files/default/etc/config/network
+++ b/target/linux/etrax/base-files/etc/config/network
diff --git a/target/linux/etrax/base-files/default/etc/ipkg.conf b/target/linux/etrax/base-files/etc/ipkg.conf
index a5ffc79bc..a5ffc79bc 100644
--- a/target/linux/etrax/base-files/default/etc/ipkg.conf
+++ b/target/linux/etrax/base-files/etc/ipkg.conf
diff --git a/target/linux/etrax/base-files/default/etc/passwd b/target/linux/etrax/base-files/etc/passwd
index c5c9e46cc..c5c9e46cc 100644
--- a/target/linux/etrax/base-files/default/etc/passwd
+++ b/target/linux/etrax/base-files/etc/passwd
diff --git a/target/linux/iop32x/base-files/default/etc/config/network b/target/linux/iop32x/base-files/etc/config/network
index 1d9b55b2d..1d9b55b2d 100644
--- a/target/linux/iop32x/base-files/default/etc/config/network
+++ b/target/linux/iop32x/base-files/etc/config/network
diff --git a/target/linux/ixp4xx/base-files/default/etc/config/network b/target/linux/ixp4xx/base-files/etc/config/network
index 1d5ded372..1d5ded372 100644
--- a/target/linux/ixp4xx/base-files/default/etc/config/network
+++ b/target/linux/ixp4xx/base-files/etc/config/network
diff --git a/target/linux/rb532/base-files/default/etc/config/network b/target/linux/rb532/base-files/etc/config/network
index 827969057..827969057 100644
--- a/target/linux/rb532/base-files/default/etc/config/network
+++ b/target/linux/rb532/base-files/etc/config/network
diff --git a/target/linux/rb532/base-files/default/etc/diag.sh b/target/linux/rb532/base-files/etc/diag.sh
index d8f9a8825..d8f9a8825 100644
--- a/target/linux/rb532/base-files/default/etc/diag.sh
+++ b/target/linux/rb532/base-files/etc/diag.sh
diff --git a/target/linux/rb532/base-files/default/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
index fb3717499..fb3717499 100755
--- a/target/linux/rb532/base-files/default/sbin/cf2nand
+++ b/target/linux/rb532/base-files/sbin/cf2nand
diff --git a/target/linux/rb532/base-files/default/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
index 67e4a94a8..67e4a94a8 100755
--- a/target/linux/rb532/base-files/default/sbin/wget2nand
+++ b/target/linux/rb532/base-files/sbin/wget2nand
diff --git a/target/linux/rdc/base-files/default/etc/diag.sh b/target/linux/rdc/base-files/etc/diag.sh
index 8d5c38262..8d5c38262 100644
--- a/target/linux/rdc/base-files/default/etc/diag.sh
+++ b/target/linux/rdc/base-files/etc/diag.sh
diff --git a/target/linux/rdc/base-files/default/etc/inittab b/target/linux/rdc/base-files/etc/inittab
index 02b920c8d..02b920c8d 100644
--- a/target/linux/rdc/base-files/default/etc/inittab
+++ b/target/linux/rdc/base-files/etc/inittab
diff --git a/target/linux/sibyte/base-files/default/etc/config/network b/target/linux/sibyte/base-files/etc/config/network
index 9b65652f0..9b65652f0 100644
--- a/target/linux/sibyte/base-files/default/etc/config/network
+++ b/target/linux/sibyte/base-files/etc/config/network
diff --git a/target/linux/sibyte/base-files/default/etc/inittab b/target/linux/sibyte/base-files/etc/inittab
index a6f4e17f0..a6f4e17f0 100644
--- a/target/linux/sibyte/base-files/default/etc/inittab
+++ b/target/linux/sibyte/base-files/etc/inittab
diff --git a/target/linux/x86/base-files/default/etc/preinit.arch b/target/linux/x86/base-files/etc/preinit.arch
index f29f0d448..f29f0d448 100644
--- a/target/linux/x86/base-files/default/etc/preinit.arch
+++ b/target/linux/x86/base-files/etc/preinit.arch
diff --git a/target/linux/x86/base-files/default/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index ffd0b93ab..ffd0b93ab 100644
--- a/target/linux/x86/base-files/default/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh