From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Mon, 12 Dec 2022 07:53:22 +0000 (+0100)
Subject: rename gpu script
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/cae69632ed89f09bea8319fa2afcc7d28dcfb4d1

rename gpu script
---

diff --git a/gpu.sh b/gpu.sh
deleted file mode 100644
index 65ad628..0000000
--- a/gpu.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-
-# SPDX-License-Identifier: MIT
-
-set -o errexit
-set -o nounset
-set -o pipefail
-set -o xtrace
-
-cd "$(dirname "$0")"
-
-unset LC_CTYPE
-unset LANG
-
-build_linux()
-{
-(
-        test -d linux || git clone https://github.com/AsahiLinux/linux
-        cd linux
-        git fetch -a -t
-        git reset --hard asahi-6.1-rc8-3;
-        source "$HOME/.cargo/env"
-        cat ../../config-gpu.txt > .config
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
-)
-}
-
-build_m1n1()
-{
-(
-        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
-        cd m1n1
-        git fetch -a -t
-        git reset --hard v1.2.3;
-        make -j `nproc`
-)
-}
-
-build_uboot()
-{
-(
-        test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
-        cd u-boot
-        git fetch -a -t
-        git reset --hard asahi-v2022.10-1;
-
-        make apple_m1_defconfig
-        make -j `nproc`
-)
-        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
-}
-
-package_boot_bin()
-{
-(
-        export M1N1_VERSION=1.2.3-2
-        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
-        cat <<EOF > m1n1_${M1N1_VERSION}_arm64/DEBIAN/control
-Package: m1n1
-Version: $M1N1_VERSION
-Section: base
-Priority: optional
-Architecture: arm64
-Maintainer: Thomas Glanzmann <thomas@glanzmann.de>
-Description: Apple silicon boot loader
- Next to m1n1 this also contains the device trees and u-boot.
-EOF
-
-        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
-#!/bin/bash
-
-export PATH=/bin
-if [ -f /boot/efi/m1n1/boot.bin ]; then
-        cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
-fi
-mkdir -p /boot/efi/m1n1/
-cp /usr/lib/m1n1/boot.bin /boot/efi/m1n1/
-EOF
-
-        chmod 755 m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst
-        dpkg-deb --build m1n1_${M1N1_VERSION}_arm64
-)
-}
-
-mkdir -p build
-cd build
-
-build_linux
-build_m1n1
-build_uboot
-package_boot_bin
diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
new file mode 100644
index 0000000..65ad628
--- /dev/null
+++ b/m1n1_uboot_kernel.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+
+# SPDX-License-Identifier: MIT
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+cd "$(dirname "$0")"
+
+unset LC_CTYPE
+unset LANG
+
+build_linux()
+{
+(
+        test -d linux || git clone https://github.com/AsahiLinux/linux
+        cd linux
+        git fetch -a -t
+        git reset --hard asahi-6.1-rc8-3;
+        source "$HOME/.cargo/env"
+        cat ../../config-gpu.txt > .config
+        make LLVM=-15 olddefconfig
+        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+)
+}
+
+build_m1n1()
+{
+(
+        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1
+        cd m1n1
+        git fetch -a -t
+        git reset --hard v1.2.3;
+        make -j `nproc`
+)
+}
+
+build_uboot()
+{
+(
+        test -d u-boot || git clone https://github.com/AsahiLinux/u-boot
+        cd u-boot
+        git fetch -a -t
+        git reset --hard asahi-v2022.10-1;
+
+        make apple_m1_defconfig
+        make -j `nproc`
+)
+        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
+}
+
+package_boot_bin()
+{
+(
+        export M1N1_VERSION=1.2.3-2
+        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
+        cat <<EOF > m1n1_${M1N1_VERSION}_arm64/DEBIAN/control
+Package: m1n1
+Version: $M1N1_VERSION
+Section: base
+Priority: optional
+Architecture: arm64
+Maintainer: Thomas Glanzmann <thomas@glanzmann.de>
+Description: Apple silicon boot loader
+ Next to m1n1 this also contains the device trees and u-boot.
+EOF
+
+        cat > m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst <<EOF
+#!/bin/bash
+
+export PATH=/bin
+if [ -f /boot/efi/m1n1/boot.bin ]; then
+        cp /boot/efi/m1n1/boot.bin /boot/efi/m1n1/`date +%Y%m%d%H%M`.bin
+fi
+mkdir -p /boot/efi/m1n1/
+cp /usr/lib/m1n1/boot.bin /boot/efi/m1n1/
+EOF
+
+        chmod 755 m1n1_${M1N1_VERSION}_arm64/DEBIAN/postinst
+        dpkg-deb --build m1n1_${M1N1_VERSION}_arm64
+)
+}
+
+mkdir -p build
+cd build
+
+build_linux
+build_m1n1
+build_uboot
+package_boot_bin