From 8dde7740ee758ab54a94c663081afae7d5163d6b Mon Sep 17 00:00:00 2001 From: wbx Date: Sat, 10 Sep 2005 17:57:49 +0000 Subject: [PATCH] make - layout, discussed with nbd git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1891 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/openwrt/Makefile | 6 ++-- .../files/{ar7 => ar7-2.4}/etc/config/network | 0 .../{ar7 => ar7-2.4}/etc/network.overrides | 0 .../{brcm => brcm-2.4}/etc/config/network | 0 .../{brcm => brcm-2.4}/etc/init.d/S05nvram | 0 .../{brcm => brcm-2.4}/etc/network.overrides | 0 .../openwrt/files/brcm-2.6/etc/config/network | 31 +++++++++++++++++++ .../files/brcm-2.6/etc/network.overrides | 26 ++++++++++++++++ .../etc/config/network | 0 .../etc/network.overrides | 0 10 files changed, 60 insertions(+), 3 deletions(-) rename target/linux/package/openwrt/files/{ar7 => ar7-2.4}/etc/config/network (100%) rename target/linux/package/openwrt/files/{ar7 => ar7-2.4}/etc/network.overrides (100%) rename target/linux/package/openwrt/files/{brcm => brcm-2.4}/etc/config/network (100%) rename target/linux/package/openwrt/files/{brcm => brcm-2.4}/etc/init.d/S05nvram (100%) rename target/linux/package/openwrt/files/{brcm => brcm-2.4}/etc/network.overrides (100%) create mode 100644 target/linux/package/openwrt/files/brcm-2.6/etc/config/network create mode 100644 target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides rename target/linux/package/openwrt/files/{soekris => soekris-2.4}/etc/config/network (100%) rename target/linux/package/openwrt/files/{soekris => soekris-2.4}/etc/network.overrides (100%) diff --git a/target/linux/package/openwrt/Makefile b/target/linux/package/openwrt/Makefile index 6fa350a9d..82ceb3d90 100644 --- 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) @@ -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/target/linux/package/openwrt/files/ar7/etc/config/network b/target/linux/package/openwrt/files/ar7-2.4/etc/config/network similarity index 100% rename from target/linux/package/openwrt/files/ar7/etc/config/network rename to target/linux/package/openwrt/files/ar7-2.4/etc/config/network diff --git a/target/linux/package/openwrt/files/ar7/etc/network.overrides b/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides similarity index 100% rename from target/linux/package/openwrt/files/ar7/etc/network.overrides rename to target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides diff --git a/target/linux/package/openwrt/files/brcm/etc/config/network b/target/linux/package/openwrt/files/brcm-2.4/etc/config/network similarity index 100% rename from target/linux/package/openwrt/files/brcm/etc/config/network rename to target/linux/package/openwrt/files/brcm-2.4/etc/config/network diff --git a/target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram b/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram similarity index 100% rename from target/linux/package/openwrt/files/brcm/etc/init.d/S05nvram rename to target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram diff --git a/target/linux/package/openwrt/files/brcm/etc/network.overrides b/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides similarity index 100% rename from target/linux/package/openwrt/files/brcm/etc/network.overrides rename to target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides diff --git a/target/linux/package/openwrt/files/brcm-2.6/etc/config/network b/target/linux/package/openwrt/files/brcm-2.6/etc/config/network new file mode 100644 index 000000000..9487a7426 --- /dev/null +++ b/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/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides b/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides new file mode 100644 index 000000000..81801ef5f --- /dev/null +++ b/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/target/linux/package/openwrt/files/soekris/etc/config/network b/target/linux/package/openwrt/files/soekris-2.4/etc/config/network similarity index 100% rename from target/linux/package/openwrt/files/soekris/etc/config/network rename to target/linux/package/openwrt/files/soekris-2.4/etc/config/network diff --git a/target/linux/package/openwrt/files/soekris/etc/network.overrides b/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides similarity index 100% rename from target/linux/package/openwrt/files/soekris/etc/network.overrides rename to target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides