sync base-files with whiterussian

[openwrt/svn-archive/archive.git] / openwrt / target / linux / package / openwrt / Makefile

diff --git a/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/openwrt/Makefile
index 6fb20d62294aff1ac94bd6a5512bfa3ba6a86423..994ce533888c48aef080c4c27810c5c691589207 100644 (file)
--- a/openwrt/target/linux/package/openwrt/Makefile
+++ b/openwrt/target/linux/package/openwrt/Makefile
@@ -3,13 +3,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := base-files-arch
-PKG_RELEASE := 1
+PKG_RELEASE := 2
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
 IDIR_OPENWRT:=$(PKG_BUILD_DIR)/ipkg
-IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk
+IPKG_OPENWRT:=$(PACKAGE_DIR)/base-files-$(BOARD)-$(KERNEL)_$(PKG_RELEASE)_$(ARCH).ipk
 
 $(PKG_BUILD_DIR)/.prepared:
        mkdir -p $(PKG_BUILD_DIR)
@@ -33,18 +33,21 @@ $(PKG_BUILD_DIR)/.built:
        
 $(IDIR_OPENWRT):
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_OPENWRT) ipkg/base-files-arch.control $(PKG_RELEASE) $(ARCH)
-       $(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control
+       $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control
 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)
-       mkdir -p $(IDIR_OPENWRT)/etc/init.d
-       [ -f files/network.overrides.$(BOARD) ] && cp files/network.overrides.$(BOARD) $(IDIR_OPENWRT)/etc/network.overrides
-       [ -f files/S05nvram.$(BOARD) ] && install -m0755 files/S05nvram.$(BOARD) $(IDIR_OPENWRT)/etc/init.d/S05nvram
+       [ -d files/$(BOARD)-$(KERNEL) ] && cp -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/
+       find $(IDIR_OPENWRT) -name CVS | xargs rm -rf
+       find $(IDIR_OPENWRT) -name .svn | xargs rm -rf
        $(RSTRIP) $(IDIR_OPENWRT)
        $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR)
 
-install: compile
+install-targets: compile openwrt-install
+
+openwrt-install:
        $(IPKG) install $(IPKG_OPENWRT)
-compile: install-dev $(IPKG_OPENWRT)
+
+compile-targets: install-dev $(IPKG_OPENWRT)
 install-dev:
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -a ./include/* $(STAGING_DIR)/usr/include/
+       cp -fpR ./include/[a-z]* $(STAGING_DIR)/usr/include/