Fix u-boot boot.scr and some last minute fixes to make_rootfs.sh

Author: anarsoul

arch/boot-sd-arch.cmd

@@ -1,11 +1,11 @@
-part uuid ${devtype} ${devnum}:${bootpart} uuid
+part uuid ${devtype} ${devnum}:${distro_bootpart} uuid
 setenv bootargs console=${console} console=tty0 root=PARTUUID=${uuid} rw rootwait
 setenv kernel_addr_z 0x44080000
 
-if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_z} /boot/Image.gz; then
+if load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_z} /boot/Image.gz; then
   unzip ${kernel_addr_z} ${kernel_addr_r}
-  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
-    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux.img; then
+  if load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
+    if load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} /boot/initramfs-linux.img; then
       booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
     else
       booti ${kernel_addr_r} - ${fdt_addr_r};

arch/boot.scr

@@ -60,8 +60,7 @@ if [ -n "$BOOT" ]; then
 	BOOT=$(readlink -f "$BOOT")
 fi
 
-#TEMP=$(mktemp -d)
-TEMP="../tmp"
+TEMP=$(mktemp -d)
 ARCHDIR="../arch"
 cleanup() {
 	if [ -e "$DEST/proc/cmdline" ]; then
@@ -106,7 +105,7 @@ case $DISTRO in
 esac
 
 mkdir -p $BUILD
-TARBALL="$TEMP/$(basename $ROOTFS)"
+TARBALL="../tmp/$(basename $ROOTFS)"
 
 mkdir -p "$BUILD"
 if [ ! -e "$TARBALL" ]; then
@@ -160,15 +159,17 @@ EOF
 		# Cleanup preinstalled Kernel
 		do_chroot pacman -Rsn --noconfirm linux-aarch64 || true
 		do_chroot pacman -Sy --noconfirm || true
-		do_chroot pacman -S --noconfirm dkms-rtl8723cs
 		do_chroot pacman -S --noconfirm --needed dosfstools curl xz iw rfkill netctl dialog wpa_supplicant \
-			     alsa-utils pv linux-pine64 linux-pine64-headers networkmanager || true
+			     alsa-utils pv linux-pine64 linux-pine64-headers networkmanager dkms-rtl8723cs || true
 
 		cp $ARCHDIR/boot.scr $DEST/boot/
 		cp $ARCHDIR/boot-sd-arch.cmd $DEST/boot/
 		cp $ARCHDIR/asound.state $DEST/var/lib/alsa
 		cp $ARCHDIR/$MODEL/sunxi-spl.bin $DEST/boot/
 		cp $ARCHDIR/$MODEL/u-boot.itb $DEST/boot/
+		cp ../package/root/usr/local/sbin/pine64_first_boot.sh $DEST/usr/local/sbin/
+		cp ../package/root/usr/local/sbin/resize_rootfs.sh $DEST/usr/local/sbin/
+		cp ../package/root/etc/systemd/system/pine64-first-boot.service $DEST/etc/systemd/system/
 
 		do_chroot systemctl enable NetworkManager
 		case "$VARIANT" in