Build bionic/disco and stretch/buster

ayufan-rock64 · Jul 7, 2019 · fb28b59 · fb28b59
1 parent 24ba386
commit fb28b59
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,10 +93,21 @@ stretch-minimal-arm64 rock64: *build
 stretch-minimal-arm64 rockpro64: *build
 stretch-minimal-arm64 rockpi4b: *build
 
+buster-minimal-arm64 rock64: *build
+buster-minimal-arm64 rockpro64: *build
+
 bionic-minimal-arm64 rock64: *build
 bionic-minimal-armhf rock64: *build
 bionic-minimal-arm64 rockpro64: *build
 bionic-minimal-armhf rockpro64: *build
 bionic-minimal-arm64 pinebookpro: *build
 bionic-minimal-armhf pinebookpro: *build
 bionic-minimal-arm64 rockpi4b: *build
+
+disco-minimal-arm64 rock64: *build
+disco-minimal-armhf rock64: *build
+disco-minimal-arm64 rockpro64: *build
+disco-minimal-armhf rockpro64: *build
+disco-minimal-arm64 pinebookpro: *build
+disco-minimal-armhf pinebookpro: *build
+disco-minimal-arm64 rockpi4b: *build
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ include Makefile.versions.mk
 export RELEASE_NAME ?= $(VERSION)~dev
 export RELEASE ?= 1
 
-BUILD_SYSTEMS := bionic xenial jessie stretch
+BUILD_SYSTEMS := bionic disco stretch buster
 BUILD_VARIANTS := minimal mate lxde i3 openmediavault containers
 BUILD_ARCHS := armhf arm64
 BUILD_MODELS := rock64 rockpro64 pinebookpro rockpi4b

diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh
@@ -73,7 +73,7 @@ TAR_OPTIONS=""
 DISTRIB=""
 
 case $DISTRO in
-	xenial|zesty|artful|bionic)
+	bionic|disco)
 		version=$(curl -s https://api.github.com/repos/ayufan-rock64/linux-rootfs/releases/latest | jq -r ".tag_name")
 		ROOTFS="https://github.com/ayufan-rock64/linux-rootfs/releases/download/${version}/ubuntu-${DISTRO}-${VARIANT}-${version}-${BUILD_ARCH}.tar.xz"
 		FALLBACK_ROOTFS="https://github.com/ayufan-rock64/linux-rootfs/releases/download/${version}/ubuntu-${DISTRO}-minimal-${version}-${BUILD_ARCH}.tar.xz"
@@ -82,7 +82,7 @@ case $DISTRO in
 		EXTRA_ARCHS="arm64"
 		;;
 
-	sid|stretch)
+	stretch|buster)
 		version=$(curl -s https://api.github.com/repos/ayufan-rock64/linux-rootfs/releases/latest | jq -r ".tag_name")
 		ROOTFS="https://github.com/ayufan-rock64/linux-rootfs/releases/download/${version}/debian-${DISTRO}-${VARIANT}-${version}-${BUILD_ARCH}.tar.xz"
 		FALLBACK_ROOTFS="https://github.com/ayufan-rock64/linux-rootfs/releases/download/${version}/debian-${DISTRO}-minimal-${version}-${BUILD_ARCH}.tar.xz"