more notes

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 5a9f35958da0c2774e88abeb237c08f6393228e8..0d143eb6a3eda030fdfcb899932563724419a44d 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,6 +31,7 @@ build_uboot()
 )
 
         cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
 build_linux()
@@ -42,7 +43,8 @@ build_linux()
         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/config-2022-01-24 > .config
+        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
 )
@@ -67,8 +69,7 @@ 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/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'
@@ -99,7 +100,7 @@ build_live_stick()
 )
 }
 
-build_fs()
+build_dd()
 {
 (
         rm -f media
@@ -134,13 +135,31 @@ build_di_stick()
         (cd di-stick; tar cf ../m1-d-i.tar .)
 }
 
+upload()
+{
+        unset MYCURLARGS;
+        for FILE in "$@"; do
+                MYCURLARGS="$MYCURLARGS -F file=@${FILE}";
+        done;
+        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 m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin di-stick/vmlinuz k.deb
+}
+
 mkdir -p build
 cd build
 
-# build_m1n1
-# build_uboot
-# build_linux
-# build_rootfs
-# build_live_stick
+build_m1n1
+build_uboot
+build_linux
+build_rootfs
+build_live_stick
 build_di_stick
-# build_fs
+build_dd
+upload_artefacts