Accept file path to every command

Author: ayufan

Makefile

@@ -43,7 +43,8 @@ boot-tools/.git:
 boot-tools: boot-tools/.git
 
 linux-pine64-$(DATE).tar.xz: linux/arch/arm64/boot/Image boot-tools kernel/initrd.gz
-	cd kernel && bash ./make_kernel_tarball.sh $(shell dirname $(shell readlink -f "$@"))
+	cd kernel && \
+		bash ./make_kernel_tarball.sh $(shell readlink -f "$@")
 
 kernel-tarball: linux-pine64-$(DATE).tar.xz
 
@@ -54,14 +55,14 @@ simple-image-pinebook-$(DATE).img: linux-pine64-$(DATE).tar.xz boot-tools
 		bash ./make_simpleimage.sh $(shell readlink -f "$@") 100 $(shell readlink -f linux-pine64-$(DATE).tar.xz)
 
 %.img.xz: %.img
-	xz -3 $<
+	xz -f -3 $<
 
 xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img: simple-image-pinebook-$(DATE).img.xz linux-pine64-$(DATE).tar.xz boot-tools
-	sudo MODEL=pinebook DATE=$(DATE) bash \
-		./build-pine64-image.sh \
-		$(shell readlink -f simple-image-pinebook.img.xz) \
+	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) \
 		xenial \
-		$(RELEASE)
+		pinebook
 
 xenial-pinebook: xenial-pinebook-bspkernel-$(DATE)-$(RELEASE).img.xz

build-environment/Dockerfile

@@ -10,7 +10,7 @@ RUN apt-get install -y python git-core gnupg flex bison gperf build-essential \
     gcc-arm-linux-gnueabi g++-arm-linux-gnueabi ccache \
     sudo
 
-RUN apt-get install -y cpio nano vim kmod
+RUN apt-get install -y cpio nano vim kmod kpartx
 
 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

@@ -8,17 +8,18 @@
 # -  https://www.stdin.xyz/downloads/people/longsleep/pine64-images/simpleimage-pine64-latest.img.xz
 # -  https://www.stdin.xyz/downloads/people/longsleep/pine64-images/linux/linux-pine64-latest.tar.xz"
 
-SIMPLEIMAGE="$1"
-KERNELTAR="$2"
-DISTRO="$3"
-COUNT="$4"
+OUT_IMAGE="$1"
+SIMPLEIMAGE="$2"
+KERNELTAR="$3"
+DISTRO="$4"
+MODEL="$5"
 if [[ -z "$MODEL" ]]; then
   MODEL="pine64"
 fi
 export MODEL
 
 if [ -z "$SIMPLEIMAGE" -o -z "$KERNELTAR" ]; then
-	echo "Usage: $0 <simpleimage.img.xz> <kernel.tar.xz> [distro] [count]"
+	echo "Usage: $0 <result.img> <simpleimage.img.xz> <kernel.tar.xz> [distro] [model]"
 	exit 1
 fi
 
@@ -31,21 +32,15 @@ if [ -z "$DISTRO" ]; then
 	DISTRO="xenial"
 fi
 
-if [ -z "$COUNT" ]; then
-	COUNT=1
-fi
-
 SIMPLEIMAGE=$(readlink -f "$SIMPLEIMAGE")
 KERNELTAR=$(readlink -f "$KERNELTAR")
 
 SIZE=7300 # MiB
-if [[ -z "$DATE" ]]; then
-  DATE=$(date +%Y%m%d_%H%M%S_%Z)
-fi
 
 PWD=$(readlink -f .)
 TEMP=$(mktemp -p $PWD -d -t "$MODEL-build-XXXXXXXXXX")
-IMAGE="$DISTRO-$MODEL-bspkernel-$DATE-$COUNT.img"
+IMAGE="$(basename "$OUT_IMAGE")"
+OUT_IMAGE="$(readlink -f "$IMAGE")"
 echo "> Building in $TEMP ..."
 
 cleanup() {
@@ -55,7 +50,7 @@ cleanup() {
     umount $TEMP/rootfs/* || true
     umount "$TEMP/rootfs" || true
     kpartx -sd "$TEMP/$IMAGE" || true
-    kpartx -sd "$IMAGE" || true
+    kpartx -sd "$OUT_IMAGE" || true
     rmdir "$TEMP/boot"
     rmdir "$TEMP/rootfs"
     rm -r "$TEMP"
@@ -90,6 +85,6 @@ mount /dev/mapper/${DEVICENAME}p2 "$TEMP/rootfs"
 sleep 2
 (cd simpleimage && sh ./make_rootfs.sh "$TEMP/rootfs" "$KERNELTAR" "$DISTRO" "$TEMP/boot")
 
-mv -v "$TEMP/$IMAGE" .
+mv -v "$TEMP/$IMAGE" "$OUT_IMAGE"
 
 fstrim "$TEMP/rootfs"

kernel/make_kernel_tarball.sh

@@ -5,7 +5,7 @@ set -e
 DEST="$1"
 
 if [ -z "$DEST" ]; then
-	echo "Usage: $0 <destination-folder> [linux-folder] [extra-version]"
+	echo "Usage: $0 <destination-path> [linux-folder] [extra-version]"
 	exit 1
 fi
 
@@ -41,17 +41,7 @@ cp -rv "$BOOT_TOOLS/boot/" "$TEMP/"
 # Use uEnv.txt.in so we do not overwrite customizations on next update.
 mv "$TEMP/boot/uEnv.txt" "$TEMP/boot/uEnv.txt.in"
 
-if [ -z "$EXTRAVERSION" -a -e "$LINUX/.version" ]; then
-	EXTRAVERSION=$(cat "$LINUX/.version")
-else
-	EXTRAVERSION=$(date +%s)
-fi
-
-if [ -z "$VERSION" ]; then
-  VERSION="$(ls -1tr $TEMP/lib/modules/|tail -n1)-$EXTRAVERSION"
-fi
-
-echo "Building $VERSION ..."
-tar -C "$TEMP" -cJ --owner=0 --group=0 --xform='s,./,,' -f "$DEST/linux-pine64-$VERSION.tar.xz" .
+echo "Building $DEST ..."
+tar -C "$TEMP" -cJ --owner=0 --group=0 --xform='s,./,,' -f "$DEST" .
 
-echo "Done - $DEST/linux-pine64-$VERSION.tar.xz"
+echo "Done - $DEST"