diff --git a/update-gluon.sh b/update-gluon.sh index 9e3e96fb02d67f792c2f28591ca408045c7379b9..6848ee0362afa5790e79abdddc3aa5259b637605 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"