From eb41a5a3cd774be058351d33b76cf87470c77b8f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 30 Nov 2018 21:49:29 +0100
Subject: [PATCH 1/4] Update README.md for v2018.1.3.0

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index be0254a..45a61af 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
 - v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
 - v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
 - 0.9.2: site-ffhh: v0.9.2, gluon: v2017.1.8

From 4318c765299bd55fb26dd4dde2c5a47bec2f32c8 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 30 Nov 2018 21:50:15 +0100
Subject: [PATCH 2/4] Update target list for broken targets

---
 config/defaults.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index 5671fe2..4b49556 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -29,8 +29,7 @@ if ENV["BROKEN"]
 	gluon_targets += %w(
 		ar71xx-mikrotik
 		brcm2708-bcm2710
-		ipq40xx
-		mvebu-cortexa9
+		mvebu
 		ramips-mt7620
 	)
 end

From 83fbbf6bff9bd80fa8ee8e6f8242145d3e957e6a Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 30 Nov 2018 21:50:33 +0100
Subject: [PATCH 3/4] Bump version to v2018.1.3.0

---
 config/defaults.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index 4b49556..db0f75b 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,7 +1,7 @@
 <%
 gluon_branch = "stable"
 #gluon_branch = "experimental"
-gluon_release = "v2018.1.1.0"
+gluon_release = "v2018.1.3.0"
 
 # Add the +exp and current date if this is an experimental release
 gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"

From 7bd06f67e893bb384105be55e17bf120725a38ed Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 3 Dec 2018 19:31:27 +0100
Subject: [PATCH 4/4] v2018.1.3: fix target ipq806x

---
 config/defaults.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index db0f75b..8704739 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -18,7 +18,6 @@ gluon_targets = %w(
 		x86-generic
 		x86-geode
 		x86-64
-		ipq806x
 		ramips-mt7620
 		ramips-mt7628
 		ramips-rt305x
@@ -29,6 +28,7 @@ if ENV["BROKEN"]
 	gluon_targets += %w(
 		ar71xx-mikrotik
 		brcm2708-bcm2710
+		ipq806x
 		mvebu
 		ramips-mt7620
 	)