go 4k

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f5800105d2be71d3edcbcc51b925cd358b0dcd05..4a92e11701ba2b5e9b19f38510320cd6d8b7239f 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,59 +1,78 @@
 #!/bin/bash
 
 #!/bin/bash
 

+# SPDX-License-Identifier: MIT
+

 set -x
 set -e
 
 unset LC_CTYPE
 unset LANG
 
 set -x
 set -e
 
 unset LC_CTYPE
 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
+        fi
+}
+
+build_linux()
+{
+(
+        handle_crosscompile
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
+        cd linux
+        git fetch
+        git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
+        curl -s https://tg.st/u/5nly | git am -
+        curl -s https://tg.st/u/0wM8 | git am -
+        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
+        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
+        curl -s https://tg.st/u/m1-config-smc-2022-02-06 > .config
+        make olddefconfig
+        make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
+)
+}
+

 build_m1n1()
 {
 (
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch
 build_m1n1()
 {
 (
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
         cd m1n1
         git fetch

-        git reset --hard origin/main; git clean -f -x -d
-        make -j 16
+        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        make -j $(( 2* `nproc`)) &> /dev/null

 )
 }
 
 build_uboot()
 {
 (
 )
 }
 
 build_uboot()
 {
 (

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

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

-        git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
+        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

         make apple_m1_defconfig
         make apple_m1_defconfig

-        # it is normal that it runs on an error at the end
-        make -j 16 || true
+        make -j $(( 2* `nproc`)) &> /dev/null

 )
 
 )
 

-        cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
-}
-
-build_linux()
-{
-(
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
-        cd linux
-        git fetch
-        git reset --hard origin/asahi; git clean -f -x -d
-        curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
-        curl -s https://tg.st/u/5nly | git am -
-        curl -s https://tg.st/u/0wM8 | git am -
-        curl -s https://tg.st/u/config-2022-01-28 > .config
-        make olddefconfig
-        make -j 16 bindeb-pkg
-)
+        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

 }
 
 build_rootfs()
 {
 (
 }
 
 build_rootfs()
 {
 (

+        handle_crosscompile

         sudo rm -rf testing
         sudo rm -rf testing

-        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
+        sudo eatmydata ${DEBOOTSTRAP} --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/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`
 


@@ -68,12 +87,11 @@ build_rootfs()
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/

-        sudo cp ../../files/eth0 etc/network/interfaces.d/
-        sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
+        sudo cp ../../files/interfaces etc/network/interfaces

         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'

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

 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 
 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 


@@ -100,7 +118,7 @@ build_live_stick()
 )
 }
 
 )
 }
 

-build_fs()
+build_dd()

 {
 (
         rm -f media
 {
 (
         rm -f media


@@ -144,22 +162,23 @@ upload()
         curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
 }
 
         curl -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
 }
 

-

 upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
 upload_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb

-        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin di-stick/vmlinuz k.deb
+        upload m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb

 }
 
 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
+
+build_linux

 build_m1n1
 build_uboot
 build_m1n1
 build_uboot

-build_linux

 build_rootfs
 build_live_stick
 build_di_stick
 build_rootfs
 build_live_stick
 build_di_stick

-build_fs
+build_dd

 upload_artefacts
 upload_artefacts