From 736d3c7d2bde3d92de260393f1fbd292c7c39cfd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Feb 2014 17:11:11 +0100
Subject: [PATCH] Rename BRANCH to GLUON_BRANCH, update Gluon packages

---
 Makefile | 2 +-
 modules  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e5776d9b5..28d7292c4 100644
--- a/Makefile
+++ b/Makefile
@@ -298,7 +298,7 @@ images: $(patsubst %,call_image/%,$(PROFILES)) ;
 
 manifest: FORCE
 	mkdir -p $(GLUON_IMAGEDIR)/sysupgrade
-	(cd $(GLUON_IMAGEDIR)/sysupgrade && echo "BRANCH=$(BRANCH)" && echo && ($(foreach profile,$(PROFILES), \
+	(cd $(GLUON_IMAGEDIR)/sysupgrade && echo 'BRANCH=$(GLUON_BRANCH)' && echo && ($(foreach profile,$(PROFILES), \
 		$(foreach model,$(GLUON_$(profile)_MODELS), \
 			for file in gluon-*-'$(GLUON_$(profile)_MODEL_$(model))-sysupgrade.bin'; do \
 				[ -e "$$file" ] && echo \
diff --git a/modules b/modules
index cb87d15dc..5f6be79fd 100644
--- a/modules
+++ b/modules
@@ -10,7 +10,7 @@ PACKAGES_MAC80211_REPO=git://nbd.name/aa-mac80211.git
 PACKAGES_MAC80211_COMMIT=59581a13b62e2ea6ba5bfa8f5aaf80a4d6c3ad8d
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=cb035e3b7a1bf478ac61047b3bbe6bbd70d9a174
+PACKAGES_GLUON_COMMIT=0e489616913fb579c7603595faed886373a726e2
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
 PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370
-- 
GitLab