X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/e4c546cc2fc5e0179741890f24aa563f4f550dcf..18ae8040aaae9aff8b8c66a3575f5e2cbd31ed71:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index df60477..c020b8f 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,22 +8,33 @@ 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
+        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/m1-config-smc-2022-02-06 > .config
-
         make olddefconfig
-        make -j $(( 2* `nproc`)) bindeb-pkg
+        make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
 )
 }
 
@@ -33,21 +44,22 @@ 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 $(( 2* `nproc`))
+        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        make -j $(( 2* `nproc`)) &> /dev/null
 )
 }
 
 build_uboot()
 {
 (
+        handle_crosscompile
         test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
         cd u-boot
         git fetch
-        git reset --hard origin/x2r10g10b10; 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 -j $(( 2* `nproc`))
+        make -j $(( 2* `nproc`)) &> /dev/null
 )
 
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
@@ -57,8 +69,9 @@ build_uboot()
 build_rootfs()
 {
 (
+        handle_crosscompile
         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`
 
@@ -77,7 +90,7 @@ build_rootfs()
         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
 
@@ -158,6 +171,8 @@ upload_artefacts()
 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