remove artefacts from manual merge gone wrong

[m1-debian] / gpu.sh

diff --git a/gpu.sh b/gpu.sh
index eaef74c93883db164ff2b4bde77c6f0a3edb6bed..62678fc5cfb92b40ab83e26480dd87a6bd39a15e 100644 (file)
--- a/gpu.sh
+++ b/gpu.sh
@@ -21,8 +21,8 @@ build_linux()
         git reset --hard asahi-6.1-rc8-3;
         source "$HOME/.cargo/env"
         cat ../../config-gpu.txt > .config
         git reset --hard asahi-6.1-rc8-3;
         source "$HOME/.cargo/env"
         cat ../../config-gpu.txt > .config

-        make LLVM=-14 olddefconfig
-        make -j `nproc` V=0 bindeb-pkg > /dev/null
+        make LLVM=-15 olddefconfig
+        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null

 )
 }
 
 )
 }
 


@@ -32,7 +32,7 @@ build_m1n1()
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
         git fetch -a -t
         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`
 )
 }
         make -j `nproc`
 )
 }


@@ -49,8 +49,37 @@ build_uboot()
         make -j `nproc`
 )
         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
         make -j `nproc`
 )
         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

-        sudo cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
-        sudo cp u-boot.bin /boot/efi/m1n1/boot.bin
+}
+
+package_boot_bin()
+{
+(
+        export M1N1_VERSION=1.2.3-1
+        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
+cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
+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
 }
 
 mkdir -p build


@@ -59,3 +88,4 @@ cd build
 build_linux
 build_m1n1
 build_uboot
 build_linux
 build_m1n1
 build_uboot

+package_boot_bin