From: Thomas Glanzmann Date: Wed, 30 Aug 2023 05:36:20 +0000 (+0200) Subject: manual merge X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/3eb3e2755f4b74efb60614300ea970e1e3e716b0?ds=inline;hp=-c manual merge --- 3eb3e2755f4b74efb60614300ea970e1e3e716b0 diff --combined m1n1_uboot_kernel.sh index 772df40,293f161..e32bcde --- a/m1n1_uboot_kernel.sh +++ b/m1n1_uboot_kernel.sh @@@ -16,23 -16,14 +16,13 @@@ source "$(pwd)/build/cargo/env unset LC_CTYPE unset LANG - handle_crosscompile() - { - if [ "`uname -m`" != 'aarch64' ]; then - export ARCH=arm64 - export CROSS_COMPILE=aarch64-linux-gnu- - sudo apt install -y libc6-dev-arm64-cross - fi - } - build_linux() { ( - handle_crosscompile test -d linux || git clone https://github.com/AsahiLinux/linux cd linux git fetch -a -t - git reset --hard asahi-6.4-6; - curl https://tg.st/u/0001-remove-debug-spam.patch | git am - + git reset --hard asahi-6.4-9; cat ../../config.txt > .config make LLVM=${CLANG_VERSION} rustavailable make LLVM=${CLANG_VERSION} olddefconfig @@@ -46,7 -37,7 +36,7 @@@ build_m1n1( test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1 cd m1n1 git fetch -a -t - git reset --hard v1.3.2; + git reset --hard v1.3.3; make -j `nproc` ) } @@@ -54,7 -45,6 +44,6 @@@ build_uboot() { ( - handle_crosscompile test -d u-boot || git clone https://github.com/AsahiLinux/u-boot cd u-boot git fetch -a -t @@@ -69,7 -59,7 +58,7 @@@ package_boot_bin() { ( - export M1N1_VERSION=1.3.2 + export M1N1_VERSION=1.3.3 rm -rf m1n1_${M1N1_VERSION}_arm64 mkdir -p m1n1_${M1N1_VERSION}_arm64/DEBIAN m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/ cp u-boot.bin m1n1_${M1N1_VERSION}_arm64/usr/lib/m1n1/boot.bin