]> git.zerfleddert.de Git - m1-debian/blobdiff - bootstrap.sh
finish rc.local
[m1-debian] / bootstrap.sh
index 0fec48172d4189766c97e0a31142793dcde9dc66..776f1da301e1862be4577107bb8a01e9936012ef 100644 (file)
@@ -23,20 +23,18 @@ build_linux()
 {
 (
         handle_crosscompile
-        test -d linux || git clone --depth 1 https://github.com/jannau/linux -b spmi/work
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi
         cd 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/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
-        curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
+        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         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/config-2022-02-13 > .config
+        curl -s https://tg.st/u/DXyl.patch | git am -
+        curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am -
+        curl -s https://tg.st/u/0001-Hookup-backlight-for-MacBook-Pro-13-inch-M1-2020-J29.patch | git am -
+        curl -s https://tg.st/u/XKVZ.patch | git am -
+        curl -s https://tg.st/u/config-2022-02-19 > .config
         make olddefconfig
-        make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
+        make -j $(( 2* `nproc`)) V=0 bindeb-pkg
 )
 }
 
@@ -47,7 +45,7 @@ build_m1n1()
         cd m1n1
         git fetch
         git reset --hard origin/main; git clean -f -x -d &> /dev/null
-        make -j $(( 2* `nproc`)) &> /dev/null
+        make -j $(( 2* `nproc`))
 )
 }
 
@@ -61,7 +59,7 @@ build_uboot()
         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`)) &> /dev/null
+        make -j $(( 2* `nproc`))
 )
 
         cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
@@ -73,7 +71,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,32 +154,23 @@ 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 -4 -n -D - $MYCURLARGS https://upload.glanzmann.de/ | grep ^x-location | awk '{print $2}'
-}
-
-upload_artefacts()
+publish_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
+        sudo cp m1-d-i.tar m1.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /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
 build_uboot
-build_rootfs
-build_live_stick
-build_di_stick
-build_dd
-# upload_artefacts
+build_rootfs
+build_live_stick
+build_di_stick
+build_dd
+publish_artefacts
Impressum, Datenschutz