From 629b5c0767c8557ab688582bb6bd86c448f8c243 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jul 2005 14:02:53 +0000 Subject: add config file /etc/config/network, add board-specific network.overrides (instead of nvram.overrides) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1519 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/package/Makefile | 3 +- openwrt/target/linux/package/openwrt/Makefile | 23 +++-- .../package/openwrt/files/network.overrides.ar7 | 26 ++++++ .../package/openwrt/files/network.overrides.brcm | 100 +++++++++++++++++++++ .../package/openwrt/ipkg/base-files-arch.control | 6 ++ .../package/openwrt/ipkg/openwrt-utils.control | 9 -- 6 files changed, 150 insertions(+), 17 deletions(-) create mode 100644 openwrt/target/linux/package/openwrt/files/network.overrides.ar7 create mode 100644 openwrt/target/linux/package/openwrt/files/network.overrides.brcm create mode 100644 openwrt/target/linux/package/openwrt/ipkg/base-files-arch.control delete mode 100644 openwrt/target/linux/package/openwrt/ipkg/openwrt-utils.control (limited to 'openwrt/target/linux') diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile index adce4d4ee..a08d9048a 100644 --- a/openwrt/target/linux/package/Makefile +++ b/openwrt/target/linux/package/Makefile @@ -5,9 +5,10 @@ package-$(BR2_PACKAGE_KMOD_FUSE) += fuse package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo package-$(BR2_PACKAGE_KMOD_SHFS) += shfs package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan +package-y += openwrt ifeq ($(BOARD),brcm) -package-y += nvram openwrt +package-y += nvram ifeq ($(LINUX_VERSION),2.4.30) package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat diff --git a/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/openwrt/Makefile index ee38f75a1..5d2ea199e 100644 --- a/openwrt/target/linux/package/openwrt/Makefile +++ b/openwrt/target/linux/package/openwrt/Makefile @@ -2,29 +2,38 @@ include $(TOPDIR)/rules.mk -PKG_NAME := openwrt-utils -PKG_RELEASE := 2 +PKG_NAME := base-files-arch +PKG_RELEASE := 1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk BR2_PACKAGE_OPENWRT:=y # ignore menuconfig -$(eval $(call PKG_template,OPENWRT,openwrt-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - +$(eval $(call PKG_template,OPENWRT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) touch $@ - + +ifeq ($(BOARD),brcm) $(PKG_BUILD_DIR)/jffs2root: jffs2root.c $(TARGET_CC) -o $@ $< $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root - touch $@ -$(IPKG_OPENWRT): +$(IDIR_OPENWRT)/sbin/jffs2root: mkdir -p $(IDIR_OPENWRT)/sbin cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin + +$(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root +endif + +$(PKG_BUILD_DIR)/.built: + touch $@ + +$(IPKG_OPENWRT): + mkdir -p $(IDIR_OPENWRT)/etc + cp files/network.overrides.$(BOARD) $(IDIR_OPENWRT)/etc/network.overrides $(RSTRIP) $(IDIR_OPENWRT) $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR) diff --git a/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 b/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 new file mode 100644 index 000000000..dc58a7e59 --- /dev/null +++ b/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 @@ -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="eth0" +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=${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/network.overrides.brcm b/openwrt/target/linux/package/openwrt/files/network.overrides.brcm new file mode 100644 index 000000000..9766108a9 --- /dev/null +++ b/openwrt/target/linux/package/openwrt/files/network.overrides.brcm @@ -0,0 +1,100 @@ +# 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 + +# linksys bug; remove when not using static configuration for lan +lan_proto="static" + +remap () { + for type in lan wifi wan pppoe + do + for s in '' s + do + eval ${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" + done + done +} + +# hacks for wrt54g 1.x hardware +[ "$(nvram get boardnum)" = "42" \ +-a "$(nvram get boardtype)" = "bcm94710dev" ] && { + debug "### wrt54g 1.x hack ###" + vlan1hwname="et0" + vlan2hwname="et0" + FAILSAFE_ifnames="vlan1 vlan2 eth2" + remap eth0 vlan2 + remap eth1 vlan1 +} + +# hacks for asus wl-500g deluxe +[ "$(nvram get boardtype)" = "bcm95365r" \ +-a "$(nvram get boardnum)" = "45" ] && { + debug "### wl-500g deluxe hacks ###" + vlan0hwname="et0" + vlan1hwname="et0" + FAILSAFE_ifnames="vlan0 eth1" + remap eth0.1 vlan0 + remap eth0 vlan1 +} + +# hacks for asus wl-300g +[ "$(nvram get productid)" = "WL300g" ] && { + debug "### wl-300g hacks ###" + lan_ifnames="eth0 eth2" + wan_ifname="none" +} + +# hacks for wap54g hardware +[ "$(nvram get boardnum)" = "2" \ +-o "$(nvram get boardnum)" = "1024" ] && { + debug "### wap54g hack ###" + wan_ifname="none" + FAILSAFE_ifnames="eth0 eth1" +} + +# hacks for buffalo wla2-g54l +[ "$(nvram get boardnum)" = "00" \ +-a "$(nvram get product_name)" = "Product_name" \ +-o "$(nvram get product_name)" = "WLA2-G54L" ] && { + debug "### wla2-g54l hacks ###" + wan_ifname="none" + lan_ifnames="vlan0" +} + +# hack for asus wl-500g hardware +[ "$(nvram get boardnum)" = "asusX" \ +-a "$(nvram get boardtype)" = "bcm94710dev" ] && { + FAILSAFE_ifnames="eth0 eth2" +} + +# defaults if lan_ifname is missing +[ -z "$(nvram get lan_ifname)" ] && { + lan_ifname="br0" + lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan2 eth1 eth2 eth3"} +} + +# defaults if wan_ifname is missing +[ -z "$(nvram get wan_ifname)" ] && { + wan_ifname="vlan1" + wan_proto="dhcp" +} + +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=${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="br0" + lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1 eth2 eth3"} + 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/ipkg/base-files-arch.control b/openwrt/target/linux/package/openwrt/ipkg/base-files-arch.control new file mode 100644 index 000000000..5396f6817 --- /dev/null +++ b/openwrt/target/linux/package/openwrt/ipkg/base-files-arch.control @@ -0,0 +1,6 @@ +Package: base-files-arch +Priority: optional +Section: sys +Maintainer: Felix Fietkau +Source: buildroot internal +Description: Board/architecture specific files diff --git a/openwrt/target/linux/package/openwrt/ipkg/openwrt-utils.control b/openwrt/target/linux/package/openwrt/ipkg/openwrt-utils.control deleted file mode 100644 index 37ef63276..000000000 --- a/openwrt/target/linux/package/openwrt/ipkg/openwrt-utils.control +++ /dev/null @@ -1,9 +0,0 @@ -Package: openwrt-utils -Priority: optional -Section: sys -Maintainer: Felix Fietkau -Source: buildroot internal -Description: Basic OpenWrt utilities - This package contains: - mtd: Tool for modifying the flash chip - jffs2root: Expands the jffs2 root partition -- cgit v1.2.3