make vlan/bridge default OpenWrt configuration work

[openwrt.git] / target / linux / package / openwrt / Makefile

diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile
index 2f90631..82ceb3d 100644 (file)
--- a/target/linux/package/openwrt/Makefile
+++ b/target/linux/package/openwrt/Makefile
@@ -9,7 +9,7 @@ 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)
@@ -21,7 +21,7 @@ $(PKG_BUILD_DIR)/jffs2root: jffs2root.c
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
-$(IDIR_OPENWRT)/sbin/jffs2root:
+$(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root
        mkdir -p $(IDIR_OPENWRT)/sbin
        cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
 
@@ -33,15 +33,16 @@ $(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
-       cp files/network.overrides.$(BOARD) $(IDIR_OPENWRT)/etc/network.overrides
+       [ -d files/$(BOARD)-$(KERNEL) ] && cp -a 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: $(IPKG_OPENWRT)
+install: compile
        $(IPKG) install $(IPKG_OPENWRT)
 compile: install-dev $(IPKG_OPENWRT)
 install-dev: