remove vlan1 from default lan_ifnames

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

diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile
index 2f90631..6fa350a 100644 (file)
--- a/target/linux/package/openwrt/Makefile
+++ b/target/linux/package/openwrt/Makefile
@@ -21,7 +21,7 @@ $(PKG_BUILD_DIR)/jffs2root: jffs2root.c
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root
 
 
 $(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
 
        mkdir -p $(IDIR_OPENWRT)/sbin
        cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin
 


@@ -36,12 +36,13 @@ $(IDIR_OPENWRT):
        $(SED) s,base-files-arch,base-files-$(BOARD),g $(IDIR_OPENWRT)/CONTROL/control
 
 $(IPKG_OPENWRT): $(IDIR_OPENWRT)
        $(SED) s,base-files-arch,base-files-$(BOARD),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) ] && cp -a files/$(BOARD)/* $(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)
 
        $(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:
        $(IPKG) install $(IPKG_OPENWRT)
 compile: install-dev $(IPKG_OPENWRT)
 install-dev: