From 4c9afb5deaefdc2ded6ee6da488d68e2c29155f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 24 Oct 2018 13:09:22 +0200
Subject: [PATCH] Build pinebook-1080p variant

---
 Makefile                                      | 36 +++++++++++++------
 .../usr/local/sbin/pine64_install_to_emmc.sh  |  2 ++
 .../usr/local/sbin/pine64_upgrade_android.sh  |  2 ++
 simpleimage/make_rootfs.sh                    |  2 +-
 simpleimage/make_simpleimage.sh               |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index a9c157fb..08a6f3e9 100644
--- a/Makefile
+++ b/Makefile
@@ -94,16 +94,23 @@ simple-image-pinebook-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz b
 		export uboot=../boot-tools/boot/pine64/u-boot-pine64-pinebook.bin && \
 		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
 
+simple-image-pinebook-1080p-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
+	cd simpleimage && \
+		export boot0=../boot-tools/boot/pine64/boot0-pine64-pinebook-1080p.bin && \
+		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 zesty jessie stretch
 BUILD_VARIANTS := minimal mate i3 openmediavault
 BUILD_ARCHS := arm64
-BUILD_MODELS := pine64 pinebook sopine
+BUILD_MODELS := pine64 pinebook pinebook-1080p sopine
 
 %-$(RELEASE_NAME)-$(RELEASE).img.xz: %-$(RELEASE_NAME)-$(RELEASE).img
 	pxz -f -3 $<
 
 %-$(RELEASE_NAME)-$(RELEASE).img:	simple-image-pine64-$(RELEASE_NAME).img.xz \
 									simple-image-pinebook-$(RELEASE_NAME).img.xz \
+									simple-image-pinebook-1080p-$(RELEASE_NAME).img.xz \
 									simple-image-sopine-$(RELEASE_NAME).img.xz \
 									linux-pine64-$(RELEASE_NAME).tar.xz \
 									linux-pine64-package-$(RELEASE_NAME).deb \
@@ -123,7 +130,8 @@ kernel-tarball: linux-pine64-$(RELEASE_NAME).tar.xz
 .PHONY: linux-package
 linux-package: linux-pine64-package-$(RELEASE_NAME).deb
 
-simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img.xz
+simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img.xz \
+	simple-image-pinebook-1080p-$(RELEASE_NAME).img.xz
 
 simple-image-pine64: simple-image-pine64-$(RELEASE_NAME).img.xz
 
@@ -133,22 +141,28 @@ simple-image-sopine: simple-image-sopine-$(RELEASE_NAME).img.xz
 simple-image: simple-image-pinebook simple-image-pine64 simple-image-sopine
 
 .PHONY: zesty-minimal-pinebook
-zesty-minimal-pinebook: zesty-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+zesty-minimal-pinebook: zesty-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	zesty-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: xenial-mate-pinebook
-zesty-mate-pinebook: zesty-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+zesty-mate-pinebook: zesty-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	zesty-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: xenial-i3-pinebook
-zesty-i3-pinebook: zesty-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+zesty-i3-pinebook: zesty-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	zesty-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: xenial-minimal-pinebook
-xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	xenial-minimal-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: 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: xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	xenial-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: stretch-minimal-pine64
 stretch-minimal-pine64: stretch-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
@@ -157,10 +171,12 @@ stretch-minimal-pine64: stretch-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEA
 stretch-minimal-sopine: stretch-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: stretch-minimal-pinebook
-stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
+stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	stretch-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: jessie-minimal-pinebook
-jessie-minimal-pinebook: jessie-minimal-pinebook-$(RELEASE_NAME)-$(RELEASE).img.xz
+jessie-minimal-pinebook: jessie-minimal-pinebook-$(RELEASE_NAME)-$(RELEASE).img.xz \
+	jessie-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
 
 .PHONY: jessie-minimal-sopine
 jessie-minimal-sopine: jessie-minimal-sopine-$(RELEASE_NAME)-$(RELEASE).img.xz
diff --git a/package/root/usr/local/sbin/pine64_install_to_emmc.sh b/package/root/usr/local/sbin/pine64_install_to_emmc.sh
index c73de04a..858b03f5 100755
--- a/package/root/usr/local/sbin/pine64_install_to_emmc.sh
+++ b/package/root/usr/local/sbin/pine64_install_to_emmc.sh
@@ -53,6 +53,8 @@ case "$1" in
         REPO="ayufan-pine64/$1"
         if [[ "$(cat /etc/pine64_model)" == "pinebook" ]]; then
             PREFIX="$1-pine-a64-pinebook-v"
+        elif [[ "$(cat /etc/pine64_model)" == "pinebook-1080p" ]]; then
+            PREFIX="$1-pine-a64-pinebook-1080p-v"
         elif [[ "$(cat /etc/pine64_model)" == "sopine" ]]; then
             PREFIX="$1-pine-a64-sopine-v"
         else
diff --git a/package/root/usr/local/sbin/pine64_upgrade_android.sh b/package/root/usr/local/sbin/pine64_upgrade_android.sh
index 5521ee62..e13f762c 100755
--- a/package/root/usr/local/sbin/pine64_upgrade_android.sh
+++ b/package/root/usr/local/sbin/pine64_upgrade_android.sh
@@ -35,6 +35,8 @@ fi
 REPO="ayufan-pine64/$2"
 if [[ "$(cat /etc/pine64_model)" == "pinebook" ]]; then
     PREFIX="$2-pine-a64-pinebook-v"
+elif [[ "$(cat /etc/pine64_model)" == "pinebook-1080p" ]]; then
+    PREFIX="$2-pine-a64-pinebook-1080p-v"
 elif [[ "$(cat /etc/pine64_model)" == "sopine" ]]; then
     PREFIX="$2-pine-a64-sopine-v"
 else
diff --git a/simpleimage/make_rootfs.sh b/simpleimage/make_rootfs.sh
index 2cdea447..0cdb4e4d 100755
--- a/simpleimage/make_rootfs.sh
+++ b/simpleimage/make_rootfs.sh
@@ -224,7 +224,7 @@ EOF
 				;;
 		esac
 		do_chroot systemctl enable ssh-keygen
-		if [ "$MODEL" = "pinebook" ]; then
+		if [ "$MODEL" = "pinebook" ] || [ "$MODEL" = "pinebook-1080p" ]; then
 			do_chroot systemctl enable pinebook-headphones
 		fi
 		sed -i 's|After=rc.local.service|#\0|;' "$DEST/lib/systemd/system/serial-getty@.service"
diff --git a/simpleimage/make_simpleimage.sh b/simpleimage/make_simpleimage.sh
index 1c5da78d..4b20d33b 100755
--- a/simpleimage/make_simpleimage.sh
+++ b/simpleimage/make_simpleimage.sh
@@ -23,7 +23,7 @@ kernel_tarball="$3"
 model="$4"
 
 if [ -z "$out" ]; then
-	echo "Usage: $0 <image-file.img> [disk size in MiB] [<kernel-tarball>] [<pine64|so|pinebook>]"
+	echo "Usage: $0 <image-file.img> [disk size in MiB] [<kernel-tarball>] [<pine64|so|pinebook|pinebook-1080p>]"
 	exit 1
 fi