make m1n1 package compatible with new way to package things

diff --git a/bootstrap.sh b/bootstrap.sh
index b019d4f2d21f2ec5d51745b7ef413b4ca45eee9a..14ef418808029cc6d6cbb1a0ca57758d82db456d 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -22,8 +22,6 @@ build_rootfs()
         mkdir -p cache
         sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 
         mkdir -p cache
         sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 

-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
-

         cd testing
 
         sudo mkdir -p boot/efi
         cd testing
 
         sudo mkdir -p boot/efi


@@ -104,8 +102,6 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
 
 publish_artefacts()
 {

-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
-        cp ${KERNEL} k.deb

         sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/
 }
 
         sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/
 }
 

diff --git a/gpu.sh b/gpu.sh
index 62678fc5cfb92b40ab83e26480dd87a6bd39a15e..65ad62840bc073c38e46f383f4d53b4c8409a9db 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -54,7 +54,7 @@ build_uboot()
 package_boot_bin()
 {
 (
 package_boot_bin()
 {
 (

-        export M1N1_VERSION=1.2.3-1
+        export M1N1_VERSION=1.2.3-2

         rm -rf m1n1_${M1N1_VERSION}_arm64
         mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/
         cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin
         rm -rf m1n1_${M1N1_VERSION}_arm64
         mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/
         cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin


@@ -73,7 +73,10 @@ EOF
 #!/bin/bash
 
 export PATH=/bin
 #!/bin/bash
 
 export PATH=/bin

-cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
+if [ -f /boot/efi/m1n1/boot.bin ]; then
+        cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
+fi
+mkdir -p /boot/efi/m1n1/

 cp /usr/lib/m1n1/boot.bin /boot/efi/m1n1/
 EOF
 
 cp /usr/lib/m1n1/boot.bin /boot/efi/m1n1/
 EOF