From 7aa11efc1796c29d446eca99ec7d9bc7ed2c0072 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 29 Sep 2007 14:27:54 +0000 Subject: get rid of per-profile base-files git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9069 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/Makefile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'package/base-files/Makefile') 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 -- cgit v1.2.3