Fix naming and use parallel xz

Author: ayufan

Jenkinsfile

@@ -20,7 +20,9 @@ node('docker && linux-build') {
 
       environment.inside("--privileged -u 0:0") {
         withEnv([
-          'USE_CCACHE=true',
+          "USE_CCACHE=true",
+          "RELEASE_NAME=$VERSION",
+          "RELEASE=$BUILD_NUMBER"
         ]) {
             stage 'Prepare'
             sh '''#!/bin/bash
@@ -34,7 +36,7 @@ node('docker && linux-build') {
             sh '''#!/bin/bash
               set +xe
               export CCACHE_DIR=$WORKSPACE/ccache
-              make DATE="$DATE" RELEASE="$BUILD_NUMBER"
+              make
             '''
         }
 

Makefile

@@ -1,6 +1,6 @@
-export DATE ?= dev
+export RELEASE_NAME ?= dev
 export RELEASE ?= 1
-LOCALVERSION ?= ayufan-$(RELEASE)
+LOCALVERSION ?= -ayufan-$(RELEASE)
 LINUX_BRANCH ?= my-hacks-1.2
 BOOT_TOOLS_BRANCH ?= master
 
@@ -42,27 +42,32 @@ boot-tools/.git:
 
 boot-tools: boot-tools/.git
 
-linux-pine64-$(DATE).tar.xz: linux/arch/arm64/boot/Image boot-tools kernel/initrd.gz
+linux-pine64-$(RELEASE_NAME).tar: linux/arch/arm64/boot/Image boot-tools kernel/initrd.gz
 	cd kernel && \
 		bash ./make_kernel_tarball.sh $(shell readlink -f "$@")
 
-kernel-tarball: linux-pine64-$(DATE).tar.xz
+%.img.xz: %.img
+	pxz -f -3 $<
 
-simple-image-pinebook-$(DATE).img: linux-pine64-$(DATE).tar.xz boot-tools
+simple-image-pinebook-$(RELEASE_NAME).img: boot-tools/build/boot0_pinebook.bin boot-tools/build/u-boot-sun50iw1p1-secure-with-pinebook-dtb.bin linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
 	cd simpleimage && \
 		export boot0=../boot-tools/build/boot0_pinebook.bin && \
 		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-$(DATE).tar.xz)
-
-%.img.xz: %.img
-	xz -f -3 $<
+		bash ./make_simpleimage.sh $(shell readlink -f "$@") 100 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
 
-xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img: simple-image-pinebook-$(DATE).img.xz linux-pine64-$(DATE).tar.xz boot-tools
+xenial-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img: simple-image-pinebook-$(RELEASE_NAME).img.xz linux-pine64-$(RELEASE_NAME).tar.xz boot-tools
 	sudo bash ./build-pine64-image.sh \
 		$(shell readlink -f $@) \
-		$(shell readlink -f simple-image-pinebook-$(DATE).img.xz) \
-		$(shell readlink -f linux-pine64-$(DATE).tar.xz) \
+		$(shell readlink -f simple-image-pinebook-$(RELEASE_NAME).img.xz) \
+		$(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz) \
 		xenial \
 		pinebook
 
-xenial-pinebook: xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img.xz
+.PHONY: kernel-tarball
+kernel-tarball: linux-pine64-$(RELEASE_NAME).tar.xz
+
+.PHONY: simple-image-pinebook-$(RELEASE_NAME).img
+simple-image-pinebook: simple-image-pinebook-$(RELEASE_NAME).img
+
+.PHONY: xenial-pinebook
+xenial-pinebook: xenial-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz

build-environment/Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get install -y python git-core gnupg flex bison gperf build-essential \
     sudo
 
 RUN apt-get install -y cpio nano vim kmod kpartx wget bsdtar qemu-user-static
+RUN apt-get install -y pxz
 
 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/

kernel/make_kernel_tarball.sh

@@ -42,6 +42,6 @@ cp -rv "$BOOT_TOOLS/boot/" "$TEMP/"
 mv "$TEMP/boot/uEnv.txt" "$TEMP/boot/uEnv.txt.in"
 
 echo "Building $DEST ..."
-tar -C "$TEMP" -cJ --owner=0 --group=0 --xform='s,./,,' -f "$DEST" .
+tar -C "$TEMP" -ca --owner=0 --group=0 --xform='s,./,,' -f "$DEST" .
 
 echo "Done - $DEST"