Line in the wrong section spotted by Jostein Kjønigsen

[m1-debian] / m1n1_uboot_kernel.sh

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index c26d6136fbded9e53e38a37fac06d5a7bb0a6229..72727a8916237c003b5725b9546b9b7d79bd27a7 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -9,18 +9,27 @@ set -o xtrace
 
 cd "$(dirname "$0")"
 
 
 cd "$(dirname "$0")"
 

+export CARGO_HOME="$(pwd)/build/cargo"
+export RUSTUP_HOME="$(pwd)/build/rust"
+source "$(pwd)/build/cargo/env"
+

 unset LC_CTYPE
 unset LANG
 
 unset LC_CTYPE
 unset LANG
 

+export M1N1_VERSION=1.4.11
+export KERNEL_VERSION=asahi-6.6-14
+export UBOOT_VERSION=asahi-v2023.07.02-4
+

 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t
 build_linux()
 {
 (
         test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
         git fetch -a -t

-        git reset --hard asahi-6.1-rc8-3;
-        source "$HOME/.cargo/env"
+        git reset --hard $KERNEL_VERSION
+        git clean -f -x -d > /dev/null

         cat ../../config.txt > .config
         cat ../../config.txt > .config

+        make LLVM=-15 rustavailable

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


@@ -32,7 +41,8 @@ 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.3;
+        git reset --hard v${M1N1_VERSION};
+        git clean -f -x -d > /dev/null

         make -j `nproc`
 )
 }
         make -j `nproc`
 )
 }


@@ -43,7 +53,8 @@ build_uboot()
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t
         test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch -a -t

-        git reset --hard asahi-v2022.10-1;
+        git reset --hard $UBOOT_VERSION
+        git clean -f -x -d > /dev/null

 
         make apple_m1_defconfig
         make -j `nproc`
 
         make apple_m1_defconfig
         make -j `nproc`


@@ -54,7 +65,6 @@ build_uboot()
 package_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
         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


@@ -69,7 +79,7 @@ Description: Apple silicon boot loader
  Next to m1n1 this also contains the device trees and u-boot.
 EOF
 
  Next to m1n1 this also contains the device trees and u-boot.
 EOF
 

-        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
+        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<'EOF'

 #!/bin/bash
 
 export PATH=/bin
 #!/bin/bash
 
 export PATH=/bin