X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/377069b96b7a5f294d58d087209d879757d235c7..9aca3c9cc3098a874b25dd8522571ed1cffe1d00:/gpu.sh

diff --git a/gpu.sh b/gpu.sh
index 4789b2c..65ad628 100644
--- a/gpu.sh
+++ b/gpu.sh
@@ -12,16 +12,6 @@ cd "$(dirname "$0")"
 unset LC_CTYPE
 unset LANG
 
-handle_crosscompile()
-{
-        if [ "`uname -m`" != 'aarch64' ]; then
-                export ARCH=arm64
-                export CROSS_COMPILE=aarch64-linux-gnu-
-                export DEBOOTSTRAP=qemu-debootstrap
-                sudo apt install -y libc6-dev-arm64-cross
-        fi
-}
-
 build_linux()
 {
 (
@@ -31,8 +21,8 @@ build_linux()
         git reset --hard asahi-6.1-rc8-3;
         source "$HOME/.cargo/env"
         cat ../../config-gpu.txt > .config
-        make LLVM=-14 olddefconfig
-        make -j `nproc` LLVM=-14 V=0 bindeb-pkg > /dev/null
+        make LLVM=-15 olddefconfig
+        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -42,7 +32,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
-        git reset --hard v1.2.2;
+        git reset --hard v1.2.3;
         make -j `nproc`
 )
 }
@@ -61,10 +51,44 @@ build_uboot()
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
 }
 
+package_boot_bin()
+{
+(
+        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
+        cat <<EOF > m1n1_${M1N1_VERSION}_arm64/DEBIAN/control
+Package: m1n1
+Version: $M1N1_VERSION
+Section: base
+Priority: optional
+Architecture: arm64
+Maintainer: Thomas Glanzmann <thomas@glanzmann.de>
+Description: Apple silicon boot loader
+ Next to m1n1 this also contains the device trees and u-boot.
+EOF
+
+        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
+#!/bin/bash
+
+export PATH=/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
+
+        chmod 755 m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst
+        dpkg-deb --build m1n1_${M1N1_VERSION}_arm64
+)
+}
+
 mkdir -p build
 cd build
 
-handle_crosscompile
 build_linux
 build_m1n1
 build_uboot
+package_boot_bin