Skip to content

Commit 4c9afb5

Browse files
ayufanayufan
committed
Build pinebook-1080p variant
1 parent a7f8b60 commit 4c9afb5

File tree

5 files changed

+32
-12
lines changed

5 files changed

+32
-12
lines changed

‎Makefile‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,23 @@ simple-image-pinebook-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz b
9494
export uboot=../boot-tools/boot/pine64/u-boot-pine64-pinebook.bin && \
9595
bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
9696

97+
simple-image-pinebook-1080p-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
98+
cd simpleimage && \
99+
export boot0=../boot-tools/boot/pine64/boot0-pine64-pinebook-1080p.bin && \
100+
export uboot=../boot-tools/boot/pine64/u-boot-pine64-pinebook-1080p.bin && \
101+
bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
102+
97103
BUILD_SYSTEMS := xenial zesty jessie stretch
98104
BUILD_VARIANTS := minimal mate i3 openmediavault
99105
BUILD_ARCHS := arm64
100-
BUILD_MODELS := pine64 pinebook sopine
106+
BUILD_MODELS := pine64 pinebook pinebook-1080p sopine
101107

102108
%-$(RELEASE_NAME)-$(RELEASE).img.xz: %-$(RELEASE_NAME)-$(RELEASE).img
103109
pxz -f -3 $<
104110

105111
%-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pine64-$(RELEASE_NAME).img.xz \
106112
simple-image-pinebook-$(RELEASE_NAME).img.xz \
113+
simple-image-pinebook-1080p-$(RELEASE_NAME).img.xz \
107114
simple-image-sopine-$(RELEASE_NAME).img.xz \
108115
linux-pine64-$(RELEASE_NAME).tar.xz \
109116
linux-pine64-package-$(RELEASE_NAME).deb \
@@ -123,7 +130,8 @@ kernel-tarball: linux-pine64-$(RELEASE_NAME).tar.xz
123130
.PHONY: linux-package
124131
linux-package: linux-pine64-package-$(RELEASE_NAME).deb
125132

126-
simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img.xz
133+
simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img.xz \
134+
simple-image-pinebook-1080p-$(RELEASE_NAME).img.xz
127135

128136
simple-image-pine64: simple-image-pine64-$(RELEASE_NAME).img.xz
129137

@@ -133,22 +141,28 @@ simple-image-sopine: simple-image-sopine-$(RELEASE_NAME).img.xz
133141
simple-image: simple-image-pinebook simple-image-pine64 simple-image-sopine
134142

135143
.PHONY: zesty-minimal-pinebook
136-
zesty-minimal-pinebook: zesty-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
144+
zesty-minimal-pinebook: zesty-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
145+
zesty-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
137146

138147
.PHONY: xenial-mate-pinebook
139-
zesty-mate-pinebook: zesty-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
148+
zesty-mate-pinebook: zesty-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
149+
zesty-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
140150

141151
.PHONY: xenial-i3-pinebook
142-
zesty-i3-pinebook: zesty-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
152+
zesty-i3-pinebook: zesty-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
153+
zesty-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
143154

144155
.PHONY: xenial-minimal-pinebook
145-
xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
156+
xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
157+
xenial-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
146158

147159
.PHONY: xenial-mate-pinebook
148-
xenial-mate-pinebook: xenial-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
160+
xenial-mate-pinebook: xenial-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
161+
xenial-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
149162

150163
.PHONY: xenial-i3-pinebook
151-
xenial-i3-pinebook: xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
164+
xenial-i3-pinebook: xenial-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
165+
xenial-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
152166

153167
.PHONY: stretch-minimal-pine64
154168
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
157171
stretch-minimal-sopine: stretch-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
158172

159173
.PHONY: stretch-minimal-pinebook
160-
stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
174+
stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
175+
stretch-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
161176

162177
.PHONY: jessie-minimal-pinebook
163-
jessie-minimal-pinebook: jessie-minimal-pinebook-$(RELEASE_NAME)-$(RELEASE).img.xz
178+
jessie-minimal-pinebook: jessie-minimal-pinebook-$(RELEASE_NAME)-$(RELEASE).img.xz \
179+
jessie-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
164180

165181
.PHONY: jessie-minimal-sopine
166182
jessie-minimal-sopine: jessie-minimal-sopine-$(RELEASE_NAME)-$(RELEASE).img.xz

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ case "$1" in
5353
REPO="ayufan-pine64/$1"
5454
if [[ "$(cat /etc/pine64_model)" == "pinebook" ]]; then
5555
PREFIX="$1-pine-a64-pinebook-v"
56+
elif [[ "$(cat /etc/pine64_model)" == "pinebook-1080p" ]]; then
57+
PREFIX="$1-pine-a64-pinebook-1080p-v"
5658
elif [[ "$(cat /etc/pine64_model)" == "sopine" ]]; then
5759
PREFIX="$1-pine-a64-sopine-v"
5860
else

‎package/root/usr/local/sbin/pine64_upgrade_android.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ fi
3535
REPO="ayufan-pine64/$2"
3636
if [[ "$(cat /etc/pine64_model)" == "pinebook" ]]; then
3737
PREFIX="$2-pine-a64-pinebook-v"
38+
elif [[ "$(cat /etc/pine64_model)" == "pinebook-1080p" ]]; then
39+
PREFIX="$2-pine-a64-pinebook-1080p-v"
3840
elif [[ "$(cat /etc/pine64_model)" == "sopine" ]]; then
3941
PREFIX="$2-pine-a64-sopine-v"
4042
else

‎simpleimage/make_rootfs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ EOF
224224
;;
225225
esac
226226
do_chroot systemctl enable ssh-keygen
227-
if [ "$MODEL" = "pinebook" ]; then
227+
if [ "$MODEL" = "pinebook" ] || [ "$MODEL" = "pinebook-1080p" ]; then
228228
do_chroot systemctl enable pinebook-headphones
229229
fi
230230
sed -i 's|After=rc.local.service|#\0|;' "$DEST/lib/systemd/system/[email protected]"

‎simpleimage/make_simpleimage.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ kernel_tarball="$3"
2323
model="$4"
2424

2525
if [ -z "$out" ]; then
26-
echo "Usage: $0 <image-file.img> [disk size in MiB] [<kernel-tarball>] [<pine64|so|pinebook>]"
26+
echo "Usage: $0 <image-file.img> [disk size in MiB] [<kernel-tarball>] [<pine64|so|pinebook|pinebook-1080p>]"
2727
exit 1
2828
fi
2929

0 commit comments

Comments
 (0)