Build bionic and stretch only

Author: ayufan

Makefile

@@ -100,8 +100,8 @@ simple-image-pinebook-1080p-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).ta
 		export uboot=../boot-tools/boot/pine64/u-boot-pine64-pinebook-1080p.bin && \
 		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
 
-BUILD_SYSTEMS := xenial stretch
-BUILD_VARIANTS := minimal mate i3 openmediavault
+BUILD_SYSTEMS := bionic stretch
+BUILD_VARIANTS := minimal mate i3 lxde openmediavault
 BUILD_ARCHS := arm64
 BUILD_MODELS := pine64 pinebook pinebook-1080p sopine
 
@@ -140,17 +140,13 @@ simple-image-sopine: simple-image-sopine-$(RELEASE_NAME).img.xz
 .PHONY: simple-image
 simple-image: simple-image-pinebook simple-image-pine64 simple-image-sopine
 
-.PHONY: xenial-minimal-pinebook
-xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
-	xenial-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+.PHONY: bionic-mate-pinebook
+bionic-mate-pinebook: bionic-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	bionic-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
-.PHONY: xenial-mate-pinebook
-xenial-mate-pinebook: xenial-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
-	xenial-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
-
-.PHONY: xenial-i3-pinebook
-xenial-i3-pinebook: xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
-	xenial-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+.PHONY: bionic-lxde-pinebook
+bionic-lxde-pinebook: bionic-lxde-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	bionic-lxde-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: stretch-minimal-pine64
 stretch-minimal-pine64: stretch-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
@@ -165,23 +161,23 @@ stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(R
 .PHONY: stretch-openmediavault-pine64
 stretch-openmediavault-pine64: stretch-openmediavault-pine64-$(RELEASE_NAME)-$(RELEASE).img.xz
 
-.PHONY: xenial-pinebook
-xenial-pinebook: xenial-minimal-pinebook xenial-mate-pinebook xenial-i3-pinebook
+.PHONY: bionic-pinebook
+bionic-pinebook: bionic-mate-pinebook bionic-lxde-pinebook
 
 .PHONY: stretch-pinebook
 stretch-pinebook: stretch-minimal-pinebook
 
 .PHONY: linux-pinebook
-linux-pinebook: simple-image-pinebook xenial-pinebook stretch-pinebook
+linux-pinebook: simple-image-pinebook bionic-pinebook stretch-pinebook
 
-.PHONY: xenial-minimal-pine64
-xenial-minimal-pine64: xenial-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+.PHONY: bionic-minimal-pine64
+bionic-minimal-pine64: bionic-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: linux-pine64
-linux-pine64: simple-image-pine64 xenial-minimal-pine64 stretch-minimal-pine64
+linux-pine64: simple-image-pine64 bionic-minimal-pine64 stretch-minimal-pine64
 
-.PHONY: xenial-minimal-sopine
-xenial-minimal-sopine: xenial-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+.PHONY: bionic-minimal-sopine
+bionic-minimal-sopine: bionic-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: linux-sopine
-linux-sopine: simple-image-sopine xenial-minimal-sopine stretch-minimal-sopine
+linux-sopine: simple-image-sopine bionic-minimal-sopine stretch-minimal-sopine

package/root/usr/local/sbin/pine64_install_to_emmc.sh

@@ -16,9 +16,10 @@ usage() {
     echo "$ $0 <system> [version]"
     echo ""
     echo "Systems:"
-    echo " - xenial-minimal (https://github.com/ayufan-pine64/linux-build/releases)"
-    echo " - xenial-mate (https://github.com/ayufan-pine64/linux-build/releases)"
-    echo " - xenial-i3 (https://github.com/ayufan-pine64/linux-build/releases)"
+    echo " - xenial|bionic-minimal (https://github.com/ayufan-pine64/linux-build/releases)"
+    echo " - xenial|bionic-mate (https://github.com/ayufan-pine64/linux-build/releases)"
+    echo " - xenial|bionic-lxde (https://github.com/ayufan-pine64/linux-build/releases)"
+    echo " - xenial|bionic-i3 (https://github.com/ayufan-pine64/linux-build/releases)"
     echo " - android-7.0 (https://github.com/ayufan-pine64/android-7.0/releases)"
     echo " - android-7.1 (https://github.com/ayufan-pine64/android-7.1/releases)"
     echo ""
@@ -42,7 +43,7 @@ if [[ ! -e /dev/mmcblk1 ]]; then
 fi
 
 case "$1" in
-    xenial-minimal|xenial-mate|xenial-i3)
+    xenial-*|bionic-*)
         REPO="ayufan-pine64/linux-build"
         PREFIX="$1-$(cat /etc/pine64_model)-bspkernel-"
         SUFFIX="-[0-9]*.img.xz"

simpleimage/make_rootfs.sh

@@ -158,8 +158,13 @@ apt-get -y update
 apt-get install -y software-properties-common dirmngr
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BF428671
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 56A3D45E
-add-apt-repository "deb http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubuntu xenial main"
-add-apt-repository "deb http://ppa.launchpad.net/ayufan/pine64-ppa/ubuntu xenial main"
+if [[ "$DISTRO" == "stretch" ]]; then
+	add-apt-repository "deb http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubuntu xenial main"
+	add-apt-repository "deb http://ppa.launchpad.net/ayufan/pine64-ppa/ubuntu xenial main"
+else
+	add-apt-repository "deb http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubuntu $DISTRO main"
+	add-apt-repository "deb http://ppa.launchpad.net/ayufan/pine64-ppa/ubuntu $DISTRO main"
+end
 curl -fsSL http://deb.ayufan.eu/orgs/ayufan-pine64/archive.key | apt-key add -
 apt-get -y update
 apt-get -y install sudo sunxi-disp-tool \
@@ -214,6 +219,11 @@ EOF
 				do_chroot systemctl set-default graphical.target
 				;;
 
+			lxde)
+				do_chroot /usr/local/sbin/install_desktop.sh lxde
+				do_chroot systemctl set-default graphical.target
+				;;
+
 			i3)
 				do_chroot /usr/local/sbin/install_desktop.sh i3
 				do_chroot systemctl set-default graphical.target