remove a broken patch that should have been nuked with the busybox upgrade (#2809)

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

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c639df8..3e83c01 100644 (file)
--- 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.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=10
+PKG_RELEASE:=12
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
@@ -130,21 +130,16 @@ 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
+       $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
        mkdir -p $(1)/dev
        mkdir -p $(1)/etc/crontabs
        mkdir -p $(1)/jffs