Support bionic

Author: ayufan

.gitignore

@@ -28,4 +28,6 @@
 /snappy/gadget/boot-assets
 /boot-tools/
 /*.deb
-
+/*.xz
+/*.img
+tmp/

Makefile

@@ -80,25 +80,25 @@ simple-image-pine64-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz boo
 	cd simpleimage && \
 		export boot0=../boot-tools/boot/pine64/boot0-pine64-plus.bin && \
 		export uboot=../boot-tools/boot/pine64/u-boot-pine64-plus.bin && \
-		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) pine64-plus
 
 simple-image-sopine-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
 	cd simpleimage && \
 		export boot0=../boot-tools/boot/pine64/boot0-pine64-sopine.bin && \
 		export uboot=../boot-tools/boot/pine64/u-boot-pine64-sopine.bin && \
-		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) pine64-sopine
 
 simple-image-pinebook-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
 	cd simpleimage && \
 		export boot0=../boot-tools/boot/pine64/boot0-pine64-pinebook.bin && \
 		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)
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) pine64-pinebook
 
 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)
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) pine64-pinebook-1080p
 
 BUILD_SYSTEMS := bionic stretch
 BUILD_VARIANTS := minimal mate i3 lxde openmediavault

build-pine64-image.sh

@@ -111,7 +111,7 @@ mount /dev/mapper/${DEVICENAME}p1 "$TEMP/boot"
 mount /dev/mapper/${DEVICENAME}p2 "$TEMP/rootfs"
 
 sleep 2
-(cd simpleimage && sh ./make_rootfs.sh "$TEMP/rootfs" "$KERNELTAR" "$PACKAGEDEB" "$DISTRO" "$TEMP/boot" "$MODEL" "$VARIANT")
+(cd simpleimage && ./make_rootfs.sh "$TEMP/rootfs" "$KERNELTAR" "$PACKAGEDEB" "$DISTRO" "$TEMP/boot" "$MODEL" "$VARIANT")
 
 mv -v "$TEMP/$IMAGE" "$OUT_IMAGE"
 

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

@@ -35,7 +35,6 @@ PACKAGES=(
 	vdpauinfo
 	aisleriot
 	geany
-	gnomine
 	gnome-sudoku
 	mplayer
 	scratch
@@ -60,7 +59,6 @@ case $DISTRO in
 		PACKAGES+=(
 			chromium-browser
 			firefox
-			gstreamer1.0-rockchip1
 		)
 		;;
 

simpleimage/make_rootfs.sh

@@ -157,7 +157,7 @@ case $DISTRO in
 		DEBUSER=pine64
 		DEBUSERPW=pine64
 		cat > "$DEST/second-phase" <<EOF
-#!/bin/sh
+#!/bin/bash
 set -ex
 export DEBIAN_FRONTEND=noninteractive
 locale-gen en_US.UTF-8
@@ -169,9 +169,8 @@ 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
+fi
 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 \

simpleimage/make_simpleimage.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Simple script to create a disk image which boots to U-Boot on Pine64.
 #
@@ -36,19 +36,7 @@ if [ "$disk_size" -lt 60 ]; then
 	exit 2
 fi
 
-if [ -z "$model" ]; then
-    model="pine64"
-fi
-
-echo "Creating $model image $out of size $disk_size MiB ..."
-
-if [ "$model" = "pine64" ]; then
-    model=""
-fi
-suffix=""
-if [ -n "$model" ]; then
-    suffix="-$model"
-fi
+echo "Creating image $out of size $disk_size MiB ..."
 
 if [[ -z "$boot0" ]]; then
 	echo "You must specify boot0 environment variable"
@@ -89,11 +77,18 @@ if [ -n "$kernel_tarball" ]; then
 	echo "Using Kernel from $kernel_tarball ..."
 	tar -C $temp -xJf "$kernel_tarball"
 	mv $temp/boot/uEnv.txt.in $temp/boot/uEnv.txt
+	if [[ -n "$model" ]]; then
+		echo "pine64_model=$model" >> $temp/boot/uEnv.txt
+	fi
 	mcopy -sm -i ${out}1 ${temp}/boot/* ::
 elif [ -e "${kernel}/pine64/Image" -a -e "${kernel}/pine64/sun50i-a64-pine64-plus.dtb" ]; then
+	cp ${kernel}/uEnv.txt ${temp}/
+	if [[ -n "$model" ]]; then
+		echo "pine64_model=$model" >> ${temp}/uEnv.txt
+	fi
 	mcopy -sm -i ${out}1 ${kernel}/pine64 ::
 	mcopy -m -i ${out}1 ${kernel}/initrd.img :: || true
-	mcopy -m -i ${out}1 ${kernel}/uEnv.txt :: || true
+	mcopy -m -i ${out}1 ${temp}/uEnv.txt :: || true
 fi
 dd if=${out}1 conv=notrunc oflag=append bs=1M seek=$((part_position/1024)) of="$out"
 rm -f ${out}1