get rid of debug_info kernel package; fix clang detection for amd64

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f380008a0919fc1079b1927fb1cac4379b6b97a5..7b46c41fc28ad1ecd2fa151d40b5954034788cc7 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,91 +14,34 @@ unset LANG
 
 export DEBOOTSTRAP=debootstrap
 
 
 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-rc6-5; 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()
 {
 (
 build_rootfs()
 {
 (

-        handle_crosscompile

         sudo rm -rf testing
         mkdir -p cache
         sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 
         sudo rm -rf testing
         mkdir -p cache
         sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 

-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
-

         cd testing
 
         cd testing
 

-        sudo mkdir -p boot/efi
+        sudo mkdir -p boot/efi/m1n1 etc/X11/xorg.conf.d

 
         sudo bash -c 'echo debian > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 
         sudo cp ../../files/sources.list etc/apt/sources.list
 
         sudo bash -c 'echo debian > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 
         sudo cp ../../files/sources.list etc/apt/sources.list

+        sudo cp ../../files/glanzmann.list etc/apt/sources.list.d/
+        sudo cp ../../files/thomas-glanzmann.gpg etc/apt/trusted.gpg.d/

         sudo cp ../../files/hosts etc/hosts
         sudo cp ../../files/resolv.conf etc/resolv.conf
         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 cp ../../files/hosts etc/hosts
         sudo cp ../../files/resolv.conf etc/resolv.conf
         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 cp ../../files/30-modeset.conf etc/X11/xorg.conf.d/30-modeset.conf
+        sudo cp ../../files/blacklist.conf etc/modprobe.d/
+
+        sudo perl -p -i -e 's/"quiet"/"net.ifnames=0"/ if /^GRUB_CMDLINE_LINUX_DEFAULT=/' etc/default/grub

 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'


@@ -107,11 +50,10 @@ build_rootfs()
 
         sudo -- ln -s lib/systemd/systemd init
 
 
         sudo -- ln -s lib/systemd/systemd init
 

-        sudo cp ../${KERNEL} .
-        sudo chroot . dpkg -i ${KERNEL}
-        sudo rm ${KERNEL}
-
-        sudo bash -c 'chroot . apt-get clean'
+        sudo chroot . apt update
+        sudo chroot . apt install -y m1n1 linux-image-asahi
+        sudo chroot . apt clean
+        sudo rm var/lib/apt/lists/* || true

 )
 }
 
 )
 }
 


@@ -121,7 +63,7 @@ build_live_stick()
         rm -rf live-stick
         mkdir -p live-stick/efi/boot live-stick/efi/debian/
         sudo cp ../files/wifi.pl testing/etc/rc.local
         rm -rf live-stick
         mkdir -p live-stick/efi/boot live-stick/efi/debian/
         sudo cp ../files/wifi.pl testing/etc/rc.local

-        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz -9 > ../live-stick/initrd.gz'
+        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | zstd -T0 -16 > ../live-stick/initrd.zstd'

         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
         cp testing/boot/vmlinuz* live-stick/vmlinuz
         cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
         cp testing/boot/vmlinuz* live-stick/vmlinuz
         cp ../files/grub.cfg live-stick/efi/debian/grub.cfg


@@ -139,86 +81,37 @@ build_dd()
         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/
         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 rm -rf mnt/init mnt/boot/efi/m1n1

         sudo umount mnt
         tar cf - media | pigz -9 > m1.tgz
 )
 }
 
         sudo umount mnt
         tar cf - media | pigz -9 > m1.tgz
 )
 }
 

-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 -s UUID -o value media`
-        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_asahi_installer_image()
 {
 (
         rm -rf aii
         mkdir -p aii/esp/m1n1
         cp -a EFI aii/esp/
 build_asahi_installer_image()
 {
 (
         rm -rf aii
         mkdir -p aii/esp/m1n1
         cp -a EFI aii/esp/

-        cp u-boot.bin aii/esp/m1n1/boot.bin
+        cp testing/usr/lib/m1n1/boot.bin aii/esp/m1n1/boot.bin

         ln media aii/media
         cd aii
         zip -r9 ../debian-base.zip esp media
 )
 }
 
         ln media aii/media
         cd aii
         zip -r9 ../debian-base.zip esp media
 )
 }
 

-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()
 {
 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'
+        echo upload build/asahi-debian-live.tar build/debian-base.zip

 }
 
 mkdir -p build
 cd build
 
 }
 
 mkdir -p build
 cd build
 

-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves zstd

 
 

-build_linux
-build_m1n1
-build_uboot

 build_rootfs
 build_rootfs

-#build_di_stick

 build_dd
 build_dd

-build_efi

 build_asahi_installer_image
 build_live_stick
 publish_artefacts
 build_asahi_installer_image
 build_live_stick
 publish_artefacts