Skip to content
Snippets Groups Projects
Commit 6df48ed2 authored by nrbffs's avatar nrbffs
Browse files

update to v1.9 and gluon v2020.1 

This allows us to remove the rootfs patch for x86
parent cce11b81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
update-gluon.sh
+ 2
− 3
View file @ 6df48ed2
...@@ -4,8 +4,8 @@ set -x ...@@ -4,8 +4,8 @@ set -x
set -eu set -eu
set -o pipefail set -o pipefail
gluon_major="v2019.1" gluon_major="v2020.1"
site_branch="v1.8" site_branch="v1.9"
gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" 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" 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 ...@@ -28,7 +28,6 @@ if git rev-parse --verify "remotes/origin/$fork_newest_minor_branch" &> /dev/nul
fi fi
git checkout "$upstream_newest_minor" 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 checkout -b "$fork_newest_minor_branch"
git tag -a "$fork_newest_minor_tag" -m "Gluon FFS $fork_newest_minor_tag" git tag -a "$fork_newest_minor_tag" -m "Gluon FFS $fork_newest_minor_tag"
git push origin "$fork_newest_minor_branch" git push origin "$fork_newest_minor_branch"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz