]> cvs.zerfleddert.de Git - m1-debian/blobdiff - bootstrap.sh
use another detection method
[m1-debian] / bootstrap.sh
index 2a1b30f86f7ae6f0d9072e2a26879089dc86a691..4fe57bf63aa9430d3ace8155388a0bda8155453c 100644 (file)
@@ -27,9 +27,11 @@ build_linux()
         cd 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 -
+        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
         curl -s https://tg.st/u/DXyl.patch | git am -
         curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am -
+        curl -s https://tg.st/u/0001-Hookup-backlight-for-MacBook-Pro-13-inch-M1-2020-J29.patch | git am -
+        curl -s https://tg.st/u/XKVZ.patch | git am -
         curl -s https://tg.st/u/config-2022-02-19 > .config
         make olddefconfig
         make -j $(( 2* `nproc`)) V=0 bindeb-pkg
@@ -76,6 +78,8 @@ build_rootfs()
 
         cd testing
 
+        sudo mkdir -p boot/efi
+
         sudo bash -c 'echo live > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
@@ -83,10 +87,10 @@ build_rootfs()
         sudo cp ../../files/sources.list etc/apt/sources.list
         sudo cp ../../files/hosts etc/hosts
         sudo cp ../../files/resolv.conf etc/resolv.conf
-        sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
         sudo cp ../../files/interfaces etc/network/interfaces
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
+        sudo cp ../../files/rc.local etc/rc.local
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -132,6 +136,26 @@ build_dd()
 )
 }
 
+build_efi()
+{
+(
+        rm -rf EFI
+        mkdir -p EFI/boot EFI/debian
+        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
+
+        export INITRD=`ls -1 testing/boot/ | grep initrd`
+        export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
+        export UUID=`blkid media | awk -F\" '{print $2}'`
+        cat > EFI/debian/grub.cfg <<EOF
+search.fs_uuid ${UUID} root
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
+initrd (\$root)/boot/${INITRD}
+boot
+EOF
+        tar czf efi.tgz EFI
+)
+}
+
 build_di_stick()
 {
         rm -rf di-stick
@@ -156,7 +180,7 @@ publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        sudo mv m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /u/
 }
 
 mkdir -p build
@@ -171,4 +195,5 @@ build_rootfs
 build_live_stick
 build_di_stick
 build_dd
+build_efi
 publish_artefacts
Impressum, Datenschutz