inital version

.gitlab-ci.yml

+image: registry.gitlab.freifunk-stuttgart.de/firmware/ffs-buildenv:master
+
+variables:
+  DOCKER_DRIVER: overlay2
+
+stages:
+  - build
+
+build:
+  stage: build
+  before_script:
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    - eval $(ssh-agent -s)
+    - ssh-add <(echo "$GIT_SSH_PRIV_KEY")
+    - git config --global user.email "firmware@freifunk-stuttgart.de"
+    - git config --global user.name "FFS Buildbot"
+    - mkdir -p ~/.ssh
+    - cat gitlab-known-hosts >> ~/.ssh/known_hosts
+  script:
+    - ./update-gluon.sh
+  cache: {}

gitlab-known-hosts

+[gitlab.freifunk-stuttgart.de]:22220 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGNCe5DNM3hGY+oEy5JeGjCDg68YrpjFivgxIAuFvhJkRdPPQpnOURuXFt/wQ0PCF/MZHVLPKwSLEfI3pkQRAg2bLyXFnLMlaaC2Q+9eZoQ6K2+NFWlKiVd3EmYGMt2USFfgFiHKeA4NNhvqtINj5pk1usFRCuUYfAegIVQl+vIvW7rpdK68Y33MGPrP81XD0E7TpasQnqnxVIaTe+QG3oNlPCToE6e8sZij3lwKGmR0gopbvUjXjuY7SCIbzEwzNET+olVfVHWMlDwuzM8tUOSbOSg6mX+I1gTJXndxdGl/dSsI9HXAe1HAa3B7zN+SDwcz+ySxsAgS8loyJMT2SD
+[gitlab.freifunk-stuttgart.de]:22220 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJPXKTRXP1BULVuiWD92F3VdNDLkNV3B7Dv7hb9/PVsCVZnH+s6lsdqYZZL/7QvzyqB/eOlXRs5PE/opGkS84Qw=
+[gitlab.freifunk-stuttgart.de]:22220 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCt1kYnQIF17lAw7kRBAZOJFOS67ZQpBPsq79srBpwu

patches/0001-resize-x86-rootfs-to-36-MB-and-kernel-to-16-MB.patch

+From 43e01839034486dbcdb2d2119f6c962ba4d64acc Mon Sep 17 00:00:00 2001
+From: nrbffs <38812627+nrbffs@users.noreply.github.com>
+Date: Fri, 1 Mar 2019 21:46:49 +0000
+Subject: [PATCH] resize x86 rootfs to 36 MB and kernel to 16 MB
+
+This will allow x86 devices with 256 MB disk to upgrade.
+---
+ targets/x86.inc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/targets/x86.inc b/targets/x86.inc
+index c66c3408..833a1960 100644
+--- a/targets/x86.inc
++++ b/targets/x86.inc
+@@ -12,3 +12,6 @@ packages 'kmod-ath9k'
+ packages $ATH10K_PACKAGES
+ packages 'kmod-gpio-button-hotplug' 'kmod-gpio-nct5104d' 'kmod-hwmon-core' 'kmod-leds-gpio' 'kmod-leds-apu2' 'kmod-sp5100_tco'
+ packages 'kmod-usb-core' 'kmod-usb-ohci' 'kmod-usb2' 'kmod-usb3' 'kmod-usb-serial'
++
++config 'CONFIG_TARGET_KERNEL_PARTSIZE=16'
++config 'CONFIG_TARGET_ROOTFS_PARTSIZE=36'
+-- 
+2.21.0
+

update-gluon.sh

+#!/bin/bash
+
+set -x
+set -eu
+set -o pipefail
+
+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"
+site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git"
+
+upstream_newest_minor=$(git ls-remote --tags --refs https://github.com/freifunk-gluon/gluon.git 'refs/tags/v2018.2*' | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1)
+# branch name in our forked gluon
+fork_newest_minor_branch="$upstream_newest_minor-ffs"
+fork_newest_minor_tag="$upstream_newest_minor-ffs0.1"
+
+{
+git clone "$gluon_git_url" gluon
+cd gluon
+git remote add upstream "$gluon_upstream_git_url"
+git fetch upstream --tags
+
+# we already have this branch - exit
+if ! git rev-parse --verify "$fork_newest_minor_branch" &> /dev/null; then
+    exit 1
+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 "$fork_newest_minor_tag"
+git push origin
+git push origin "$fork_newest_minor_tag"
+} &> /dev/null
+
+new_gluon_rev=$(git rev-parse HEAD)
+
+cd ..
+
+git clone --recurse "$site_git_url"
+git checkout nightly
+cd site-ffs/gluon
+git checkout $gluon_rev
+cd ..
+git add gluon
+git commit -m "automatic update to gluon $fork_newest_minor_tag"
+git push