From faf197b9455b7d804ba83bafa90942b613aa2d2b Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 29 Jun 2012 00:32:43 +0000 Subject: [PATCH 1/4] tools: sdcc depends on bison git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32521 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile b/tools/Makefile index 8366c4d01c..0ecd2a3dfd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -61,6 +61,7 @@ $(curdir)/xfce-macros/compile := $(curdir)/automake/install $(curdir)/missing-macros/compile := $(curdir)/automake/install $(curdir)/e2fsprogs/compile := $(curdir)/automake/install $(curdir)/libelf/compile := $(curdir)/automake/install +$(curdir)/sdcc/compile := $(curdir)/bison/install ifneq ($(CONFIG_CCACHE),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) From a2ed4b34a314b512519e698827f1caf5b0b568ee Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 29 Jun 2012 09:07:54 +0000 Subject: [PATCH 2/4] [brcm63xx] fix watchdog and rng drivers section mismatch (#11767) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32522 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...ndom-add-Broadcom-BCM63xx-RNG-driver.patch | 2 +- ...06-bcm63xx_watchdog_section_mismatch.patch | 20 +++++++++++++++++++ .../brcm63xx/patches-3.3/800-wl_exports.patch | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch diff --git a/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch b/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch index a6a2bc0cd5..8e14bd7dcc 100644 --- a/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch +++ b/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch @@ -110,7 +110,7 @@ Signed-off-by: Florian Fainelli + return 4; +} + -+static int __init bcm63xx_trng_probe(struct platform_device *pdev) ++static int __devinit bcm63xx_trng_probe(struct platform_device *pdev) +{ + struct resource *r; + struct clk *clk; diff --git a/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch b/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch new file mode 100644 index 0000000000..ae4157774a --- /dev/null +++ b/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch @@ -0,0 +1,20 @@ +--- a/drivers/watchdog/bcm63xx_wdt.c ++++ b/drivers/watchdog/bcm63xx_wdt.c +@@ -301,7 +301,7 @@ static void bcm63xx_wdt_shutdown(struct + bcm63xx_wdt_pause(); + } + +-static struct platform_driver bcm63xx_wdt = { ++static struct platform_driver bcm63xx_wdt_driver = { + .probe = bcm63xx_wdt_probe, + .remove = __devexit_p(bcm63xx_wdt_remove), + .shutdown = bcm63xx_wdt_shutdown, +@@ -311,7 +311,7 @@ static struct platform_driver bcm63xx_wd + } + }; + +-module_platform_driver(bcm63xx_wdt); ++module_platform_driver(bcm63xx_wdt_driver); + + MODULE_AUTHOR("Miguel Gaio "); + MODULE_AUTHOR("Florian Fainelli "); diff --git a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch index fd242f6a4f..0fff4d0b1b 100644 --- a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch +++ b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch @@ -24,7 +24,7 @@ if (nvram.version <= 4) --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -57,6 +57,7 @@ void (*_dma_cache_wback)(unsigned long s +@@ -58,6 +58,7 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); From b7fcfbf38174d03a4a481e53ad25873fbe402552 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 29 Jun 2012 11:42:15 +0000 Subject: [PATCH 3/4] [package] netifd: update to current git head, exposes enabled state, mtu and metric overrides for routes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32524 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/netifd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netifd/Makefile b/package/netifd/Makefile index 1177648511..1b0f04a4cf 100644 --- a/package/netifd/Makefile +++ b/package/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_VERSION:=2012-06-27 +PKG_VERSION:=2012-06-29 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=13f7f295f33c2639c390d4a6b2c58d1845e12fc3 +PKG_SOURCE_VERSION:=4b284038e226b4deace501eae66c67737c7f324c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz # PKG_MIRROR_MD5SUM:= # CMAKE_INSTALL:=1 From 79cdadea60cd27e9c68b907bcf83a13541fb6f04 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 29 Jun 2012 11:58:35 +0000 Subject: [PATCH 4/4] [package] base-files: only consider enabled default routes when finding the wan iface (#11774) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32525 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/functions/network.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh index 7475b00cba..c6b98e6e1c 100644 --- a/package/base-files/files/lib/functions/network.sh +++ b/package/base-files/files/lib/functions/network.sh @@ -49,6 +49,7 @@ __network_gateway() local __tmp="$(ubus call network.interface."$__iface" status 2>/dev/null)" local __idx=1 + local __enabled json_load "${__tmp:-{}}" @@ -60,9 +61,10 @@ __network_gateway() json_select "$((__idx++))" json_get_var __tmp target + json_get_var __enabled enabled - case "${__family}/${__tmp}" in - 4/0.0.0.0|6/::) + case "${__enabled}/${__family}/${__tmp}" in + 1/4/0.0.0.0|1/6/::) json_get_var "$__var" nexthop return $? ;;