manual merge

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100644 (file)
new mode 100755 (executable)
index 2237aff..1ff99c8
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,21 +1,28 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 # SPDX-License-Identifier: MIT
 
 
 # SPDX-License-Identifier: MIT
 

-set -x
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+cd "$(dirname "$0")"

 
 unset LC_CTYPE
 unset LANG
 
 export DEBOOTSTRAP=debootstrap
 
 
 unset LC_CTYPE
 unset LANG
 
 export DEBOOTSTRAP=debootstrap
 

+<<<<<<< HEAD
+=======

 handle_crosscompile()
 {
         if [ "`uname -m`" != 'aarch64' ]; then
                 export ARCH=arm64
                 export CROSS_COMPILE=aarch64-linux-gnu-
                 export DEBOOTSTRAP=qemu-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
 }
 
         fi
 }
 


@@ -23,12 +30,11 @@ build_linux()
 {
 (
         handle_crosscompile
 {
 (
         handle_crosscompile

-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi
+        test -d linux || git clone https://github.com/AsahiLinux/linux

         cd 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/config-2022-03-09-4k > .config
+        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
 )
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )


@@ -37,10 +43,11 @@ build_linux()
 build_m1n1()
 {
 (
 build_m1n1()
 {
 (

-        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
+        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1

         cd m1n1
         cd m1n1

-        git fetch
-        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        git fetch -a -t
+        # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
+        git reset --hard v1.2.3; git clean -f -x -d &> /dev/null

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


@@ -49,26 +56,34 @@ build_uboot()
 {
 (
         handle_crosscompile
 {
 (
         handle_crosscompile

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

         cd u-boot
         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 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`
 )
 
         make apple_m1_defconfig
         make -j `nproc`
 )
 

-        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
-        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
+        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
+

 }
 
 }
 

+>>>>>>> 0469ea3ee783f57bd1b368502d3286d96064e6e1

 build_rootfs()
 {
 (
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
 build_rootfs()
 {
 (
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache

-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools testing testing http://ftp.fau.de/debian
+        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`
 
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 


@@ -76,7 +91,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'
 


@@ -117,22 +132,6 @@ build_live_stick()
 )
 }
 
 )
 }
 

-build_dd()
-{
-(
-        rm -f media
-        dd if=/dev/zero of=media bs=1 count=0 seek=1G
-        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()
 {
 (
 build_efi()
 {
 (


@@ -142,7 +141,7 @@ build_efi()
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`

-        export UUID=`blkid media | awk -F\" '{print $2}'`
+        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
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
 linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw


@@ -155,51 +154,33 @@ EOF
 
 build_asahi_installer_image()
 {
 
 build_asahi_installer_image()
 {

-        rm -rf esp
-        mkdir esp
-        mv EFI esp/
-        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 .)
+(
+        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
+)

 }
 
 publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
 }
 
 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 di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
+        sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/

 }
 
 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-arm64-cross 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

 
 build_linux
 build_m1n1
 build_uboot
 build_rootfs
 
 build_linux
 build_m1n1
 build_uboot
 build_rootfs

-build_di_stick
-build_dd

 build_efi
 build_asahi_installer_image
 build_live_stick
 build_efi
 build_asahi_installer_image
 build_live_stick