more notes

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 26edbe33052951a8ca6f2ae36d931e1f2e46a64e..5f52b03f9ee0924e487bafcc0a017ccf290059f3 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,8 +28,7 @@ build_linux()
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -

-        curl -s https://tg.st/u/config-debian-distro-kernel-2022-03-09-4k > .config
-        git pull --commit https://github.com/povik/linux asahi-sound-wip
+        curl -s https://tg.st/u/config-2022-03-09-4k > .config

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


@@ -50,11 +49,10 @@ build_uboot()
 {
 (
         handle_crosscompile
 {
 (
         handle_crosscompile

-        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
+        test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot

         cd u-boot
         git fetch
         cd u-boot
         git fetch

-        git reset --hard origin/x2r10g10b10; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/v2-console-usb-kbd-Limit-poll-frequency-to-improve-performance.diff | patch -p1
+        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null

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


@@ -77,7 +75,7 @@ build_rootfs()
 
         sudo mkdir -p boot/efi
 
 
         sudo mkdir -p boot/efi
 

-        sudo bash -c 'echo live > etc/hostname'
+        sudo bash -c 'echo debian > etc/hostname'

 
         sudo bash -c 'echo > etc/motd'
 
 
         sudo bash -c 'echo > etc/motd'
 


@@ -156,10 +154,15 @@ EOF
 
 build_asahi_installer_image()
 {
 
 build_asahi_installer_image()
 {

-        rm -rf esp
-        mkdir esp
-        mv EFI esp/
-        zip -r9 debian-base.zip esp media
+(
+        rm -rf aii
+        mkdir -p aii/esp/m1n1
+        cp -a EFI aii/esp/
+        cp u-boot.bin aii/esp/m1n1/boot.bin
+        ln media aii/media
+        cd aii
+        zip -r9 ../debian-base.zip esp media
+)

 }
 
 build_di_stick()
 }
 
 build_di_stick()