make - layout, discussed with nbd

SVN-Revision: 1891

10 files changed, 60 insertions, 3 deletions

diff --git a/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/openwrt/Makefile
index 6fa350a..82ceb3d 100644
--- a/openwrt/target/linux/package/openwrt/Makefile
+++ b/openwrt/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)
@@ -33,10 +33,10 @@ $(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)
-	[ -d files/$(BOARD) ] && cp -a files/$(BOARD)/* $(IDIR_OPENWRT)/
+	[ -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)
diff --git a/openwrt/target/linux/package/openwrt/files/ar7/etc/config/network b/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/config/network
index 9487a74..9487a74 100644
--- a/openwrt/target/linux/package/openwrt/files/ar7/etc/config/network
+++ b/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides b/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides
index 76c3da3..76c3da3 100644
--- a/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides
+++ b/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/files/brcm/etc/config/network b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/config/network
index ee8e020..ee8e020 100644
--- a/openwrt/target/linux/package/openwrt/files/brcm/etc/config/network
+++ b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram
index 0d1300b..0d1300b 100755
--- a/openwrt/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram
+++ b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram
diff --git a/openwrt/target/linux/package/openwrt/files/brcm/etc/network.overrides b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides
index 5af02aa..5af02aa 100644
--- a/openwrt/target/linux/package/openwrt/files/brcm/etc/network.overrides
+++ b/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/config/network b/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/config/network
new file mode 100644
index 0000000..9487a74
--- /dev/null
+++ b/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/config/network
@@ -0,0 +1,31 @@
+# Network configuration file
+# Uncomment the following statements to change the network configuration
+
+## LAN configuration
+# lan_ifname="br0"
+# lan_proto="static"
+# lan_ipaddr="192.168.1.1"
+# lan_netmask="255.255.255.0"
+# lan_gateway=""
+# lan_dns=""
+
+## WAN configuration (PPPoE)
+# wan_proto=pppoe
+# wan_ifname=ppp0
+# pppoe_atm=1
+# pppoe_ifname=nas0
+# atm_vpi=8
+# atm_vci=35
+# ppp_username=my_username
+# ppp_passwd=my_passwd
+# ppp_mtu=1492
+
+## WAN configuration (PPPoA)
+# wan_proto=pppoa
+# wan_ifname=ppp0
+# atm_vpi=8
+# atm_vci=35
+# ppp_username=my_username
+# ppp_passwd=my_passwd
+# ppp_mtu=1500
+
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides b/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides
new file mode 100644
index 0000000..81801ef
--- /dev/null
+++ b/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides
@@ -0,0 +1,26 @@
+# NVRAM overrides
+#
+# This file handles the NVRAM quirks of various hardware.
+# THIS FILE IS NOT A REPLACEMENT FOR NVRAM
+
+# Load sysconf defaults
+[ -f /etc/sysconf ] && . /etc/sysconf
+
+DEFAULT_lan_proto="static"
+DEFAULT_lan_ifname="br0"
+DEFAULT_lan_ifnames="eth0"
+DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
+DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
+DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}}
+
+# failsafe if reset is held
+[ "$FAILSAFE" = "true" ] && {
+  echo "### YOU ARE IN FAILSAFE MODE ####"
+  lan_ifname=${DEFAULT_lan_proto}
+  lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}}
+  lan_ipaddr=$DEFAULT_lan_ipaddr
+  lan_netmask=$DEFAULT_lan_netmask
+  lan_hwaddr=$DEFAULT_lan_hwaddr
+  wan_ifname="none"
+  wifi_ifname="none"
+}
diff --git a/openwrt/target/linux/package/openwrt/files/soekris/etc/config/network b/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/config/network
index 5682cfe..5682cfe 100644
--- a/openwrt/target/linux/package/openwrt/files/soekris/etc/config/network
+++ b/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/soekris/etc/network.overrides b/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides
index e857d5b..e857d5b 100644
--- a/openwrt/target/linux/package/openwrt/files/soekris/etc/network.overrides
+++ b/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides