commit profile support for base-files... patches still need to be done

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

22 files changed, 22 insertions, 2 deletions

diff --git a/include/target.mk b/include/target.mk
index bd3ceb955b..6a136a1bee 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -5,6 +5,21 @@
 # See /LICENSE for more information.
 #
 
+define AddProfile
+  $(eval $(call Profile/Default))
+  $(eval $(call Profile/$(1)))
+  ifneq ($(ID),)
+    PROFILE:=$(ID)
+	$(ID)_NAME:=$(NAME)
+	$(ID)_PACKAGES:=$(PACKAGES)
+    ifneq ($(KCONFIG),)
+      PROFILE_LIST += \
+  		echo '$(ID):'; [ -z '$(NAME)' ] || echo '	$(NAME)'; echo '	Packages: $(PACKAGES)';
+    endif
+  endif
+endef
+
+
 include $(TMP_DIR)/.target.mk
 
 ifeq ($(IB),1)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5cbef91e3c..f02f1c9aa3 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -101,8 +101,13 @@ endef
 
 define Package/base-files$(TARGET)/install
 	$(CP) ./files/* $(1)/
-	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
-		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
+	if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
+		$(CP) $(PLATFORM_DIR)/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)/; \
+		fi; \
 	fi
 	$(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
 	$(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' $(1)/etc/ipkg.conf
diff --git a/target/linux/ar7-2.4/base-files/bin/firstboot b/target/linux/ar7-2.4/base-files/default/bin/firstboot
index 774bbc754b..774bbc754b 100755
--- a/target/linux/ar7-2.4/base-files/bin/firstboot
+++ b/target/linux/ar7-2.4/base-files/default/bin/firstboot
diff --git a/target/linux/ar7-2.4/base-files/etc/config/network b/target/linux/ar7-2.4/base-files/default/etc/config/network
index 911134bb0d..911134bb0d 100644
--- a/target/linux/ar7-2.4/base-files/etc/config/network
+++ b/target/linux/ar7-2.4/base-files/default/etc/config/network
diff --git a/target/linux/ar7-2.4/base-files/etc/init.d/adam2 b/target/linux/ar7-2.4/base-files/default/etc/init.d/adam2
index 425bc15d69..425bc15d69 100755
--- a/target/linux/ar7-2.4/base-files/etc/init.d/adam2
+++ b/target/linux/ar7-2.4/base-files/default/etc/init.d/adam2
diff --git a/target/linux/ar7-2.4/base-files/etc/preinit b/target/linux/ar7-2.4/base-files/default/etc/preinit
index 5b676ca3ac..5b676ca3ac 100755
--- a/target/linux/ar7-2.4/base-files/etc/preinit
+++ b/target/linux/ar7-2.4/base-files/default/etc/preinit
diff --git a/target/linux/ar7-2.4/base-files/sbin/mount_root b/target/linux/ar7-2.4/base-files/default/sbin/mount_root
index 6b90bdc9cc..6b90bdc9cc 100755
--- a/target/linux/ar7-2.4/base-files/sbin/mount_root
+++ b/target/linux/ar7-2.4/base-files/default/sbin/mount_root
diff --git a/target/linux/aruba-2.6/base-files/etc/config/network b/target/linux/aruba-2.6/base-files/default/etc/config/network
index 1d9b55b2d3..1d9b55b2d3 100644
--- a/target/linux/aruba-2.6/base-files/etc/config/network
+++ b/target/linux/aruba-2.6/base-files/default/etc/config/network
diff --git a/target/linux/brcm-2.4/base-files/bin/firstboot b/target/linux/brcm-2.4/base-files/default/bin/firstboot
index c3d9a64b87..c3d9a64b87 100755
--- a/target/linux/brcm-2.4/base-files/bin/firstboot
+++ b/target/linux/brcm-2.4/base-files/default/bin/firstboot
diff --git a/target/linux/brcm-2.4/base-files/etc/diag.sh b/target/linux/brcm-2.4/base-files/default/etc/diag.sh
index 3b08554c64..3b08554c64 100644
--- a/target/linux/brcm-2.4/base-files/etc/diag.sh
+++ b/target/linux/brcm-2.4/base-files/default/etc/diag.sh
diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/done b/target/linux/brcm-2.4/base-files/default/etc/init.d/done
index 0640b61938..0640b61938 100755
--- a/target/linux/brcm-2.4/base-files/etc/init.d/done
+++ b/target/linux/brcm-2.4/base-files/default/etc/init.d/done
diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig
index 4cc23d233b..4cc23d233b 100755
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig
diff --git a/target/linux/brcm-2.4/base-files/etc/preinit b/target/linux/brcm-2.4/base-files/default/etc/preinit
index 1c4e59f152..1c4e59f152 100755
--- a/target/linux/brcm-2.4/base-files/etc/preinit
+++ b/target/linux/brcm-2.4/base-files/default/etc/preinit
diff --git a/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe b/target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe
index 0544339de8..0544339de8 100755
--- a/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe
+++ b/target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe
diff --git a/target/linux/brcm-2.4/base-files/sbin/mount_root b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
index ffa6072c66..ffa6072c66 100755
--- a/target/linux/brcm-2.4/base-files/sbin/mount_root
+++ b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
diff --git a/target/linux/ixp4xx-2.6/base-files/etc/config/network b/target/linux/ixp4xx-2.6/base-files/default/etc/config/network
index 1d9b55b2d3..1d9b55b2d3 100644
--- a/target/linux/ixp4xx-2.6/base-files/etc/config/network
+++ b/target/linux/ixp4xx-2.6/base-files/default/etc/config/network
diff --git a/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig b/target/linux/ixp4xx-2.6/base-files/default/etc/init.d/netconfig
index ded5f4b8d6..ded5f4b8d6 100755
--- a/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig
+++ b/target/linux/ixp4xx-2.6/base-files/default/etc/init.d/netconfig
diff --git a/target/linux/rb532-2.6/base-files/etc/config/network b/target/linux/rb532-2.6/base-files/default/etc/config/network
index 8279690574..8279690574 100644
--- a/target/linux/rb532-2.6/base-files/etc/config/network
+++ b/target/linux/rb532-2.6/base-files/default/etc/config/network
diff --git a/target/linux/rb532-2.6/base-files/sbin/cf2nand b/target/linux/rb532-2.6/base-files/default/sbin/cf2nand
index 9cb216ca82..9cb216ca82 100755
--- a/target/linux/rb532-2.6/base-files/sbin/cf2nand
+++ b/target/linux/rb532-2.6/base-files/default/sbin/cf2nand
diff --git a/target/linux/sibyte-2.6/base-files/etc/config/network b/target/linux/sibyte-2.6/base-files/default/etc/config/network
index 9b65652f06..9b65652f06 100644
--- a/target/linux/sibyte-2.6/base-files/etc/config/network
+++ b/target/linux/sibyte-2.6/base-files/default/etc/config/network
diff --git a/target/linux/sibyte-2.6/base-files/etc/inittab b/target/linux/sibyte-2.6/base-files/default/etc/inittab
index a6f4e17f01..a6f4e17f01 100644
--- a/target/linux/sibyte-2.6/base-files/etc/inittab
+++ b/target/linux/sibyte-2.6/base-files/default/etc/inittab
diff --git a/target/linux/x86-2.6/base-files/etc/config/network b/target/linux/x86-2.6/base-files/default/etc/config/network
index 68d8e4240e..68d8e4240e 100644
--- a/target/linux/x86-2.6/base-files/etc/config/network
+++ b/target/linux/x86-2.6/base-files/default/etc/config/network