X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/8b9cfcd516507d510eaa4df00cad54a4ba099e73..7248ed42b94dd21c133ed8ab125ceda789f0587f:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 0d5ecad..a55b12e 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,6 +16,7 @@ handle_crosscompile()
                 export ARCH=arm64
                 export CROSS_COMPILE=aarch64-linux-gnu-
                 export DEBOOTSTRAP=qemu-debootstrap
+                sudo apt install -y libc6-dev-arm64-cross
         fi
 }
 
@@ -23,12 +24,12 @@ build_linux()
 {
 (
         handle_crosscompile
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b asahi
+        test -d linux || git clone https://github.com/AsahiLinux/linux
         cd linux
-        git fetch
-        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
+        git fetch -a -t
+        git reset --hard asahi-6.0-rc5-4; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-        curl -s https://tg.st/u/config-2022-07-19-16k.txt > .config
+        cat ../../config > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -39,8 +40,9 @@ build_m1n1()
 (
         test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
         cd m1n1
-        git fetch
-        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        git fetch -a -t
+        # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
+        git reset --hard v1.1.4; git clean -f -x -d &> /dev/null
         make -j `nproc`
 )
 }
@@ -49,10 +51,13 @@ build_uboot()
 {
 (
         handle_crosscompile
-        test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot
+        test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
         cd u-boot
-        git fetch
-        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
+        git fetch -a -t
+        # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
+        git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null
+        git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
+        curl -s https://tg.st/u/0001-usb-request-on-8-bytes-for-USB_SPEED_FULL-bMaxPacket.patch | git am -
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -72,7 +77,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://deb.debian.org/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk,cryptsetup testing testing http://deb.debian.org/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -201,11 +206,14 @@ publish_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 rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
 
 build_linux
 build_m1n1
 build_uboot
+
+exit
+
 build_rootfs
 #build_di_stick
 build_dd