more tips

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f6d091132ee0eaf0095f4d50fa9f80fb6f68c71e..859c24f102342cd1a5d3da98627b5f1025a59070 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,12 +28,13 @@ build_linux()
         git fetch
         git reset --hard origin/spmi/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/5nly.patch | git am -
+        curl -s https://tg.st/u/0wM8.patch | 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/0001-21-02-axboe-grabbing-anv-lock-around-the-issue-does-.patch | git am -
+        curl -s https://tg.st/u/50c69de75b60f6e47dc9f2a2ee85c6f69648e489.patch | git am -
         curl -s https://tg.st/u/config-2022-02-16 > .config
         make olddefconfig
         make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
@@ -73,7 +74,8 @@ 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
+        mkdir -p cache
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --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`
 
@@ -155,17 +157,17 @@ build_di_stick()
         (cd di-stick; tar cf ../m1-d-i.tar .)
 }
 
-upload_artefacts()
+publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        scp m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb root@tg.st:/u/
+        sudo mv m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb /u/
 }
 
 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
+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
 
 build_linux
 build_m1n1
@@ -174,4 +176,4 @@ build_rootfs
 build_live_stick
 build_di_stick
 build_dd
-upload_artefacts
+publish_artefacts