From 6df48ed2809f6032ab28572c1847bd7726b9e5c8 Mon Sep 17 00:00:00 2001
From: nrbffs <38812627+nrbffs@users.noreply.github.com>
Date: Mon, 17 Feb 2020 11:04:47 +0100
Subject: [PATCH] update to v1.9 and gluon v2020.1

This allows us to remove the rootfs patch for x86
---
 update-gluon.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/update-gluon.sh b/update-gluon.sh
index 9e3e96f..6848ee0 100755
--- a/update-gluon.sh
+++ b/update-gluon.sh
@@ -4,8 +4,8 @@ set -x
 set -eu
 set -o pipefail
 
-gluon_major="v2019.1"
-site_branch="v1.8"
+gluon_major="v2020.1"
+site_branch="v1.9"
 
 gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git"
 gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git"
@@ -28,7 +28,6 @@ if git rev-parse --verify "remotes/origin/$fork_newest_minor_branch" &> /dev/nul
 fi
 
 git checkout "$upstream_newest_minor"
-git am ../patches/0001-resize-x86-rootfs-to-36-MB-and-kernel-to-16-MB.patch
 git checkout -b "$fork_newest_minor_branch"
 git tag -a "$fork_newest_minor_tag" -m "Gluon FFS $fork_newest_minor_tag"
 git push origin "$fork_newest_minor_branch"
-- 
GitLab