From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 14 Dec 2022 16:47:10 +0000 (+0100)
Subject: get rid of debug_info kernel package; fix clang detection for amd64
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/e7515ac07d2d66cfe161da4d7bb1040a9c22ed89

get rid of debug_info kernel package; fix clang detection for amd64
---

diff --git a/config.txt b/config.txt
index d5856a1..926d7a1 100644
--- a/config.txt
+++ b/config.txt
@@ -3336,7 +3336,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_USB_PEGASUS=m
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=n
 CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NET_VENDOR_MICROSOFT=y
diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index a3e381e..6922e31 100644
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -34,9 +34,9 @@ build_linux()
         git fetch -a -t
         git reset --hard asahi-6.1-2;
         cat ../../config.txt > .config
-        make LLVM=-15 rustavailable
-        make LLVM=-15 olddefconfig
-        make -j `nproc` LLVM=-15 V=0 bindeb-pkg > /dev/null
+        make LLVM=${CLANG_VERSION} rustavailable
+        make LLVM=${CLANG_VERSION} olddefconfig
+        make -j `nproc` LLVM=${CLANG_VERSION} V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -100,6 +100,12 @@ EOF
 )
 }
 
+if type clang-15; then
+        export CLANG_VERSION=-15
+elif type clang-11; then
+        export CLANG_VERSION=-11
+fi
+
 mkdir -p build
 cd build
 
diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index c8fd1af..d6f1f33 100644
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -39,6 +39,7 @@ my %asahi_options = (
         'CONFIG_CONSTRUCTORS' => 'y',
         'CONFIG_DEBUG_INFO' => 'n',
         'CONFIG_DEBUG_INFO_BTF' => 'n',
+        'CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT' => 'n',
         'CONFIG_DRM' => 'y',
         'CONFIG_DRM_APPLE' => 'y',
         'CONFIG_DRM_ASAHI' => 'y',