fix kernel reset

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index c0caf2bd3dfbcdededd4de7231c9e5688f459c3a..768fb5f4cd6e01a213b31a2e7e09c7be8c0a87a2 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

+# SPDX-License-Identifier: MIT
+

 set -x
 set -e
 
 set -x
 set -e
 


@@ -21,28 +23,32 @@ build_uboot()
 {
 (
         # Build u-boot
 {
 (
         # Build u-boot

-        test -d u-boot || git clone https://github.com/kettenis/u-boot
+        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

         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 16

 )
 
 )
 

-        cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
+        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_linux()
 {
 (
 }
 
 build_linux()
 {
 (

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

         cd linux
         git fetch
         cd linux
         git fetch

-        git reset --hard origin/asahi; git clean -f -x -d
+        git reset --hard origin/smc/work; 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/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/m1-config-smc-2022-02-06 > .config
+        curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
+        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+

         make olddefconfig
         make -j 16 bindeb-pkg
 )
         make olddefconfig
         make -j 16 bindeb-pkg
 )


@@ -52,7 +58,7 @@ build_rootfs()
 {
 (
         sudo rm -rf testing
 {
 (
         sudo rm -rf testing

-        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,iwd,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`
 


@@ -67,7 +73,8 @@ 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/interfaces etc/network/interfaces
+        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 update'
         sudo bash -c 'chroot . apt install -y firmware-linux-free'


@@ -84,20 +91,20 @@ build_rootfs()
 )
 }
 
 )
 }
 

-build_stick()
+build_live_stick()

 {
 (
 {
 (

-        rm -rf stick
-        mkdir -p stick/efi/boot stick/efi/debian/
-        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../stick/initrd.gz'
-        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi stick/efi/boot/bootaa64.efi
-        cp testing/boot/vmlinuz* stick/vmlinuz
-        cp ../files/grub.cfg stick/efi/debian/grub.cfg
-        (cd stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
+        rm -rf live-stick
+        mkdir -p live-stick/efi/boot live-stick/efi/debian/
+        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../live-stick/initrd.gz'
+        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
+        cp testing/boot/vmlinuz* live-stick/vmlinuz
+        cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
+        (cd live-stick; tar cf ../asahi-debian-live.tar .)

 )
 }
 
 )
 }
 

-build_fs()
+build_dd()

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


@@ -113,12 +120,50 @@ build_fs()
 )
 }
 
 )
 }
 

+build_di_stick()
+{
+        rm -rf di-stick
+        mkdir -p di-stick/efi/boot di-stick/efi/debian/
+        test -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/wpa.conf initrd/etc/
+        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../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 .)
+}
+
+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 u-boot.macho di-stick/vmlinuz k.deb
+}
+

 mkdir -p build
 cd build
 
 mkdir -p build
 cd build
 

-# build_m1n1
-# build_uboot
-# build_linux
-# build_rootfs
-# build_stick
-# build_fs
+build_linux
+build_m1n1
+build_uboot
+build_rootfs
+build_live_stick
+build_di_stick
+build_dd
+upload_artefacts