nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OpenWrt

Browse Source
This commit is contained in:
Matthias Schiffer 2014-07-04 08:28:21 +02:00
parent bf34a3c99d
commit 1090ba73b3
3 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules
View File

@ -1,7 +1,7 @@
GLUON_FEEDS='openwrt gluon routing luci' GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git OPENWRT_REPO=git://git.openwrt.org/12.09/openwrt.git
OPENWRT_COMMIT=595ebf6f0d39394e5518869d4fc436cfd27e4d3c OPENWRT_COMMIT=be9a71c6f07634f2570741b453055c6108500569
PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git PACKAGES_OPENWRT_REPO=git://git.openwrt.org/12.09/packages.git
PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3 PACKAGES_OPENWRT_COMMIT=381bbea65989b63e30f43ab87e51b042325bbff3

12
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
View File

@ -3,10 +3,10 @@ Date: Wed, 7 May 2014 22:57:10 +0200
Subject: tools/Makefile: fix host tools build dependencies Subject: tools/Makefile: fix host tools build dependencies
diff --git a/tools/Makefile b/tools/Makefile diff --git a/tools/Makefile b/tools/Makefile
index 2236373..1f45367 100644 index 6658f8c..26a3fb1 100644
--- a/tools/Makefile --- a/tools/Makefile
+++ b/tools/Makefile +++ b/tools/Makefile
@@ -74,6 +74,7 @@ endif @@ -75,6 +75,7 @@ endif
$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-) $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
$(curdir)/builddirs-default := $(tools-y) $(curdir)/builddirs-default := $(tools-y)
@ -14,7 +14,7 @@ index 2236373..1f45367 100644
ifndef DUMP_TARGET_DB ifndef DUMP_TARGET_DB
define PrepareStaging define PrepareStaging
@for dir in $(1); do ( \ @for dir in $(1); do ( \
@@ -85,10 +86,16 @@ define PrepareStaging @@ -86,10 +87,16 @@ define PrepareStaging
endef endef
# preparatory work # preparatory work
@ -31,7 +31,7 @@ index 2236373..1f45367 100644
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
$(call PrepareStaging,$(STAGING_DIR_HOST)) $(call PrepareStaging,$(STAGING_DIR_HOST))
@@ -100,7 +107,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build @@ -101,7 +108,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
define PrepareCommand define PrepareCommand
@ -40,7 +40,7 @@ index 2236373..1f45367 100644
@mkdir -p "$$(dir $$@)"; rm -f "$$@" @mkdir -p "$$(dir $$@)"; rm -f "$$@"
@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ @export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
echo "Command $(1) not found."; false; \ echo "Command $(1) not found."; false; \
@@ -109,7 +116,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared @@ -110,7 +117,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
endef endef
endif endif
@ -49,7 +49,7 @@ index 2236373..1f45367 100644
@rm -f $@ @rm -f $@
@if stat --version > /dev/null 2>&1; then \ @if stat --version > /dev/null 2>&1; then \
ln -s `which stat` $@; \ ln -s `which stat` $@; \
@@ -127,8 +134,8 @@ $(eval $(call PrepareCommand,seq,gseq seq)) @@ -128,8 +135,8 @@ $(eval $(call PrepareCommand,seq,gseq seq))
$(eval $(call PrepareCommand,python,python2 python)) $(eval $(call PrepareCommand,python,python2 python))
$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python) $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python)

25
patches/openwrt/0029-hotplug2-use-source-hosted-by-OpenWrt-as-the-original-source-is-down.patch
View File

@ -1,25 +0,0 @@
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Jul 2014 16:19:16 +0200
Subject: hotplug2: use source hosted by OpenWrt as the original source is down
diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index e8483dd..05134c2 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -12,13 +12,9 @@ PKG_REV:=201
PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=4
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=hotplug2-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://svn.nomi.cz/svn/isteve/hotplug2
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-#PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
-#PKG_MD5SUM:=ea2c01d027b4002e4e6b0ff266f51a51
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=7bab8ba67555a8400424f3c92ec67579
include $(INCLUDE_DIR)/package.mk