From 33819e3d926f25795fedc78d288e2d5792bcfdae Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon@anavi.org>
Date: Wed, 6 Mar 2019 19:28:25 +0200
Subject: [PATCH 1/3] make_rootfs.sh: Support building ubuntu with KDE

Support option kde for building Ubuntu 18.04.2 image for
A64-Teres with kde-plasma-desktop. This image uses the same
repositories as bionic.

Signed-off-by: Leon Anavi <leon@anavi.org>
---
 SOFTWARE/A64-TERES/scripts/make_rootfs.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
index 85918ada..f8767288 100755
--- a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
+++ b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
@@ -77,7 +77,7 @@ case $DISTRO in
 	xenial)
 		ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/16.04.2/release/ubuntu-base-16.04.2-base-arm64.tar.gz"
 		;;
-	bionic)
+	bionic|kde)
 		ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/18.04.2/release/ubuntu-base-18.04-base-arm64.tar.gz"
 		;;
 	sid|jessie)
@@ -238,6 +238,10 @@ EOF
 
 add_ubuntu_apt_sources() {
 	local release="$1"
+	# Use Ubuntu 18.04 bionic repositories for KDE image
+	if [ "$release" = "kde" ]; then
+		release="bionic"
+	fi
 	cat > "$DEST/etc/apt/sources.list" <<EOF
 deb http://ports.ubuntu.com/ ${release} main restricted universe multiverse
 deb-src http://ports.ubuntu.com/ ${release} main restricted universe multiverse
@@ -285,10 +289,10 @@ EOF
 		rm -f "$DEST/etc/resolv.conf"
 		mv "$DEST/etc/resolv.conf.dist" "$DEST/etc/resolv.conf"
 		;;
-	xenial|bionic|sid|jessie)
+	xenial|bionic|sid|jessie|kde)
 		rm "$DEST/etc/resolv.conf"
 		cp /etc/resolv.conf "$DEST/etc/resolv.conf"
-		if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" ]; then
+		if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" -o "$DISTRO" = "kde" ]; then
 			DEB=ubuntu
 			DEBUSER=olimex
 			DEBUSERPW=olimex
@@ -307,6 +311,10 @@ EOF
 				rsync \
 				blueman \
 			"
+			if [ "$DISTRO" = "kde" ]; then
+				# Additional KDE packages
+				EXTRADEBS+=" kde-plasma-desktop "
+			fi
 		elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" ]; then
 			DEB=debian
 			DEBUSER=olimex

From e06c55198227c5d34140559b45a33ff67048379d Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon@anavi.org>
Date: Wed, 6 Mar 2019 23:07:36 +0200
Subject: [PATCH 2/3] make_rootfs.sh: Image for a real geek

Ubuntu 18.04.2 with dwm, surf web browser, stterm and vim.
A truly geek look and feel. Inspired by a conversation with
Vladimir Ivanov and Lazar Hristov during the last weekend.

Suggested-by: Vladimir Ivanov <vladitx@nucleusys.com>, Lazar Hristov <lhristov@gmail.com>
Signed-off-by: Leon Anavi <leon@anavi.org>
---
 SOFTWARE/A64-TERES/scripts/make_rootfs.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
index f8767288..814572dd 100755
--- a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
+++ b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
@@ -77,7 +77,7 @@ case $DISTRO in
 	xenial)
 		ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/16.04.2/release/ubuntu-base-16.04.2-base-arm64.tar.gz"
 		;;
-	bionic|kde)
+	bionic|kde|geek)
 		ROOTFS="http://cdimage.ubuntu.com/ubuntu-base/releases/18.04.2/release/ubuntu-base-18.04-base-arm64.tar.gz"
 		;;
 	sid|jessie)
@@ -239,7 +239,7 @@ EOF
 add_ubuntu_apt_sources() {
 	local release="$1"
 	# Use Ubuntu 18.04 bionic repositories for KDE image
-	if [ "$release" = "kde" ]; then
+	if [ "$release" = "kde" -o "$release" = "geek" ]; then
 		release="bionic"
 	fi
 	cat > "$DEST/etc/apt/sources.list" <<EOF
@@ -289,10 +289,10 @@ EOF
 		rm -f "$DEST/etc/resolv.conf"
 		mv "$DEST/etc/resolv.conf.dist" "$DEST/etc/resolv.conf"
 		;;
-	xenial|bionic|sid|jessie|kde)
+	xenial|bionic|sid|jessie|kde|geek)
 		rm "$DEST/etc/resolv.conf"
 		cp /etc/resolv.conf "$DEST/etc/resolv.conf"
-		if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" -o "$DISTRO" = "kde" ]; then
+		if [ "$DISTRO" = "xenial" -o "$DISTRO" = "bionic" -o "$DISTRO" = "kde" -o "$DISTRO" = "geek" ]; then
 			DEB=ubuntu
 			DEBUSER=olimex
 			DEBUSERPW=olimex
@@ -314,6 +314,16 @@ EOF
 			if [ "$DISTRO" = "kde" ]; then
 				# Additional KDE packages
 				EXTRADEBS+=" kde-plasma-desktop "
+			elif [ "$DISTRO" = "geek" ]; then
+				# Packages for a geek look & feel :)
+				EXTRADEBS+="\
+						xorg \
+						xdm \
+						dwm \
+						surf \
+						stterm \
+						vim \
+				"
 			fi
 		elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" ]; then
 			DEB=debian

From 67bf85d84ead914782490f009c2cad9f0046b734 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon@anavi.org>
Date: Fri, 8 Mar 2019 01:41:29 +0200
Subject: [PATCH 3/3] make_rootfs.sh: Use ppa:ayufan/pine64-ppa

Replace ppa:longsleep/ubuntu-pine64-flavour-makers with
ppa:ayufan/pine64-ppa because it provides better support
of the same deb packages for both Ubuntu 16.04 xenial and
Ubuntu 18.04 bionic.

Signed-off-by: Leon Anavi <leon@anavi.org>
---
 SOFTWARE/A64-TERES/scripts/make_rootfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
index 814572dd..0c58c67e 100755
--- a/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
+++ b/SOFTWARE/A64-TERES/scripts/make_rootfs.sh
@@ -298,7 +298,7 @@ EOF
 			DEBUSERPW=olimex
 			ADDPPACMD="apt-get -y update && \
 				apt-get install -y software-properties-common && \
-				apt-add-repository -y ppa:longsleep/ubuntu-pine64-flavour-makers \
+				apt-add-repository -y ppa:ayufan/pine64-ppa \
 			"
 			EXTRADEBS="\
 				zram-config \