Build linux-pine64-package.deb that contains all scripts and fix pinebook support

Author: ayufan

.gitignore

@@ -27,4 +27,5 @@
 /snappy/gadget/uboot.conf
 /snappy/gadget/boot-assets
 /boot-tools/
+/*.deb
 

Jenkinsfile

@@ -58,7 +58,7 @@ node('docker && linux-build') {
                 --description "${CHANGES}\n\n${BUILD_URL}" \
                 --draft
 
-            for file in *.xz; do
+            for file in *.xz *.deb; do
               github-release upload \
                   --tag "${VERSION}" \
                   --name "$(basename "$file")" \

Makefile

@@ -46,6 +46,22 @@ linux-pine64-$(RELEASE_NAME).tar: linux/arch/arm64/boot/Image boot-tools kernel/
 	cd kernel && \
 		bash ./make_kernel_tarball.sh $(shell readlink -f "$@")
 
+linux-pine64-package-$(RELEASE_NAME).deb: package
+	fpm -s dir -t deb -n linux-pine64-package -v $(RELEASE_NAME) \
+		-p $@ \
+		--deb-priority optional --category admin \
+		--force \
+		--deb-compression bzip2 \
+		--after-install package/scripts/postinst.deb \
+		--before-remove package/scripts/prerm.deb \
+		--url https://gitlab.com/ayufan-pine64/linux-build \
+		--description "GitLab Runner" \
+		-m "Kamil Trzciński <[email protected]>" \
+		--license "MIT" \
+		--vendor "Kamil Trzciński" \
+		-a arm64 \
+		package/root/=/
+
 %.tar.xz: %.tar
 	pxz -f -3 $<
 
@@ -58,17 +74,21 @@ simple-image-pinebook-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).tar.xz b
 		export uboot=../boot-tools/build/u-boot-sun50iw1p1-secure-with-pinebook-dtb.bin && \
 		bash ./make_simpleimage.sh $(shell readlink -f "$@") 100 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
 
-xenial-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pinebook-$(RELEASE_NAME).img.xz linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
+xenial-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pinebook-$(RELEASE_NAME).img.xz linux-pine64-$(RELEASE_NAME).tar.xz linux-pine64-package-$(RELEASE_NAME).deb boot-tools
 	sudo bash ./build-pine64-image.sh \
 		$(shell readlink -f $@) \
 		$(shell readlink -f simple-image-pinebook-$(RELEASE_NAME).img.xz) \
 		$(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) \
+		$(shell readlink -f linux-pine64-package-$(RELEASE_NAME).deb) \
 		xenial \
 		pinebook
 
 .PHONY: kernel-tarball
 kernel-tarball: linux-pine64-$(RELEASE_NAME).tar.xz
 
+.PHONY: linux-package
+linux-package: linux-pine64-package-$(RELEASE_NAME).deb
+
 .PHONY: simple-image-pinebook-$(RELEASE_NAME).img
 simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img
 

build-environment/Dockerfile

@@ -8,10 +8,10 @@ RUN apt-get install -y python git-core gnupg flex bison gperf build-essential \
     htop iotop sysstat iftop pigz bc device-tree-compiler lunzip \
     dosfstools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
     gcc-arm-linux-gnueabi g++-arm-linux-gnueabi ccache \
-    sudo
+    sudo cpio nano vim kmod kpartx wget bsdtar qemu-user-static \
+    pxz ruby-dev
 
-RUN apt-get install -y cpio nano vim kmod kpartx wget bsdtar qemu-user-static
-RUN apt-get install -y pxz
+RUN gem install fpm
 
 RUN curl -L https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2 | tar -C /tmp -jx && \
     mv /tmp/bin/linux/amd64/github-release /usr/local/bin/

build-pine64-image.sh

@@ -11,15 +11,16 @@
 OUT_IMAGE="$1"
 SIMPLEIMAGE="$2"
 KERNELTAR="$3"
-DISTRO="$4"
-MODEL="$5"
+PACKAGEDEB="$4"
+DISTRO="$5"
+MODEL="$6"
 if [[ -z "$MODEL" ]]; then
   MODEL="pine64"
 fi
 export MODEL
 
 if [ -z "$SIMPLEIMAGE" -o -z "$KERNELTAR" ]; then
-	echo "Usage: $0 <result.img> <simpleimage.img.xz> <kernel.tar.xz> [distro] [model]"
+	echo "Usage: $0 <result.img> <simpleimage.img.xz> <kernel.tar.xz> <package.deb> [distro] [model]"
 	exit 1
 fi
 
@@ -83,7 +84,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" "$DISTRO" "$TEMP/boot")
+(cd simpleimage && sh ./make_rootfs.sh "$TEMP/rootfs" "$KERNELTAR" "$PACKAGEDEB" "$DISTRO" "$TEMP/boot" "$MODEL")
 
 mv -v "$TEMP/$IMAGE" "$OUT_IMAGE"
 

package/root/etc/modprobe.d/blacklist-pine64.conf

@@ -0,0 +1 @@
+blacklist 8723bs_vq0

package/root/etc/modules-load.d/pine64-disp.conf

@@ -0,0 +1,2 @@
+disp
+hdmi

package/root/etc/modules-load.d/pine64-wifi.conf

@@ -0,0 +1,2 @@
+8723bs
+8723cs

package/root/etc/modules-load.d/pinebook-hall.conf

@@ -0,0 +1 @@
+hall

package/root/etc/network/interfaces.d/wlan1

@@ -0,0 +1,2 @@
+# Disable wlan1 by default (8723bs has two intefaces)
+iface wlan1 inet manual