build m1n1 and linux-image-asahi package correctly; working on bootstrap.sh

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index ab20b34779ff3d08682dfee0d2b953197074bd20..b019d4f2d21f2ec5d51745b7ef413b4ca45eee9a 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,66 +14,6 @@ unset LANG
 
 export DEBOOTSTRAP=debootstrap
 
-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()
-{
-(
-        handle_crosscompile
-        test -d linux || git clone https://github.com/AsahiLinux/linux
-        cd linux
-        git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3; git clean -f -x -d &> /dev/null
-        cat ../../config-16k.txt > .config
-        make olddefconfig
-        make -j `nproc` V=0 bindeb-pkg > /dev/null
-)
-}
-
-build_m1n1()
-{
-(
-        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
-        cd m1n1
-        git fetch -a -t
-        # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
-        git reset --hard v1.2.2; git clean -f -x -d &> /dev/null
-        make -j `nproc`
-)
-}
-
-build_uboot()
-{
-(
-        handle_crosscompile
-        test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
-        cd u-boot
-        git fetch -a -t
-        # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
-        git reset --hard asahi-v2022.10-1; git clean -f -x -d &> /dev/null
-        git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
-
-        make apple_m1_defconfig
-        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
-        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.macho
-        cp u-boot.bin 4k.bin
-        cp u-boot.bin 2k.bin
-        echo 'display=2560x1440' >> 2k.bin
-        echo 'display=wait,3840x2160' >> 4k.bin
-
-}
-
 build_rootfs()
 {
 (
@@ -129,22 +69,6 @@ build_live_stick()
 )
 }
 
-build_dd()
-{
-(
-        rm -f media
-        dd if=/dev/zero of=media bs=1 count=0 seek=2G
-        mkdir -p mnt
-        mkfs.ext4 media
-        tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
-        sudo mount -o loop media mnt
-        sudo cp -a testing/* mnt/
-        sudo rm mnt/init
-        sudo umount mnt
-        tar cf - media | pigz -9 > m1.tgz
-)
-}
-
 build_efi()
 {
 (
@@ -178,33 +102,11 @@ build_asahi_installer_image()
 )
 }
 
-build_di_stick()
-{
-        rm -rf di-stick
-        mkdir -p di-stick/efi/boot di-stick/efi/debian/
-        rm -f initrd.gz
-        wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
-        sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
-        sudo rm -rf initrd/lib/modules/*
-        sudo cp -a testing/lib/modules/* initrd/lib/modules/
-        sudo cp ../files/wifi.sh initrd/
-        sudo cp ../files/boot.sh initrd/
-        (cd initrd; find . | cpio --quiet -H newc -o | pigz -9 > ../di-stick/initrd.gz)
-        sudo rm -rf initrd
-        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi
-        cp testing/boot/vmlinuz* di-stick/vmlinuz
-        cp ../files/grub.cfg di-stick/efi/debian/grub.cfg
-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
-        cp ${KERNEL} di-stick/
-        (cd di-stick; tar cf ../m1-d-i.tar .)
-}
-
 publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
-        echo 'Reminder: Publish __all__ kernel packages'
+        sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/
 }
 
 mkdir -p build
@@ -216,8 +118,6 @@ build_linux
 build_m1n1
 build_uboot
 build_rootfs
-#build_di_stick
-build_dd
 build_efi
 build_asahi_installer_image
 build_live_stick