From: Thomas Glanzmann Date: Sun, 11 Dec 2022 22:37:43 +0000 (+0100) Subject: make m1n1 package compatible with new way to package things X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/b5a41dd14432126008b654937c0099d8888b5e50?ds=sidebyside;hp=51cd86d8e21a3332aa00a31c882ca51cb3ece224 make m1n1 package compatible with new way to package things --- diff --git a/bootstrap.sh b/bootstrap.sh index b019d4f..14ef418 100755 --- 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 - export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1` - cd testing sudo mkdir -p boot/efi @@ -104,8 +102,6 @@ build_asahi_installer_image() 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/ } diff --git a/gpu.sh b/gpu.sh index 62678fc..65ad628 100644 --- a/gpu.sh +++ b/gpu.sh @@ -54,7 +54,7 @@ build_uboot() 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 @@ -73,7 +73,10 @@ EOF #!/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