Skip to content

Commit

Permalink
Build pinebook-1080p variant
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayufan
ayufan committed Oct 24, 2018
1 parent a7f8b60 commit 4c9afb5
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 12 deletions.
36 changes: 26 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions package/root/usr/local/sbin/pine64_install_to_emmc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions package/root/usr/local/sbin/pine64_upgrade_android.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion simpleimage/make_rootfs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion simpleimage/make_simpleimage.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4c9afb5

Please sign in to comment.