瀏覽代碼

Update OpenWrt and packages

This significantly improves fastd performance, to the level it was before
Barrier Breaker.
Matthias Schiffer 9 年之前
父節點
當前提交
62268d4ab0
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 2 2
      modules
  2. 5 5
      patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch

+ 2 - 2
modules

@@ -1,10 +1,10 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/14.07/openwrt.git
-OPENWRT_COMMIT=394af9ce72f20095fd637eed45d0e84869917f20
+OPENWRT_COMMIT=32d501a8daa57b58a961ed81e3fd85f92b20c7dd
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=7c3d7ca550c950193d9700d44ec32413f8a27ead
+PACKAGES_OPENWRT_COMMIT=eaa3e00d345a52c6dc67f8b9b0b2d4a2971425d5
 PACKAGES_OPENWRT_BRANCH=for-14.07
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git

+ 5 - 5
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch

@@ -3,10 +3,10 @@ Date: Sat, 26 Jul 2014 06:10:23 +0200
 Subject: tools/Makefile: fix host tools build dependencies
 
 diff --git a/tools/Makefile b/tools/Makefile
-index 75d2b0d..ff1d299 100644
+index 9595d62..b8eef3f 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
-@@ -95,10 +95,16 @@ define PrepareStaging
+@@ -96,10 +96,16 @@ define PrepareStaging
  endef
  
  # preparatory work
@@ -23,7 +23,7 @@ index 75d2b0d..ff1d299 100644
  
  $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
  	$(call PrepareStaging,$(STAGING_DIR_HOST))
-@@ -110,7 +116,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
+@@ -111,7 +117,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
  
  
  define PrepareCommand
@@ -32,7 +32,7 @@ index 75d2b0d..ff1d299 100644
  	@mkdir -p "$$(dir $$@)"; rm -f "$$@"
  	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
  		echo "Command $(1) not found."; false; \
-@@ -119,7 +125,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
+@@ -120,7 +126,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
  endef
  endif
  
@@ -41,7 +41,7 @@ index 75d2b0d..ff1d299 100644
  	@rm -f $@
  	@if stat --version > /dev/null 2>&1; then \
  		ln -s `which stat` $@; \
-@@ -143,8 +149,8 @@ $(eval $(call PrepareCommand,tar,gtar tar))
+@@ -144,8 +150,8 @@ $(eval $(call PrepareCommand,tar,gtar tar))
  $(eval $(call PrepareCommand,diff,gdiff diff))
  
  $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,md5sum cp stat seq python awk getopt grep tar diff)