Merge remote-tracking branch 'upstream/main'

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = linux
 	pkgdesc = Linux
 	pkgver = 6.18.1.arch1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/archlinux/linux
 	arch = x86_64
 	license = GPL-2.0-only
@@ -22,7 +22,8 @@ pkgbase = linux
 	makedepends = python-sphinx
 	makedepends = python-yaml
 	makedepends = texlive-latexextra
-	options = zipkmod
+	options = !debug
+	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.1.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.1.tar.sign
 	source = https://github.com/archlinux/linux/releases/download/v6.18.1-arch1/linux-v6.18.1-arch1.patch.zst
@@ -35,12 +36,12 @@ pkgbase = linux
 	sha256sums = SKIP
 	sha256sums = e0de7a4ccf2636993b2f49081399efaa63c0bf1c0db5cf1cbbdd6f8bfbede241
 	sha256sums = SKIP
-	sha256sums = 7f5793bfae1b8f02b5fb77b383e4b1cac82013efac1195ac317b9c44e19b7f1b
+	sha256sums = 3061f542f99dd8dec161029e31dce15281cd99ec68e8403312d135ed13787dfd
 	b2sums = 6ea6a7235ee59f876b015c6fda0f2772980c6ea58240689ce581182262387cbef3aed3c95ced66cdb56479cbd83961fbcbdfdff09f049941c3daf047710adb61
 	b2sums = SKIP
 	b2sums = 48a0b27d9c7ede9141fa581c2415f48d73e155d5afb515f9f10e0cd95947027464b3e2335bb5c275527007d9170889961858909520f2e6049ef2701cf4df9095
 	b2sums = SKIP
-	b2sums = 27ac52ad3c1ac815b2cf6a36e5b9963ba7fb069c8fc98961e0e979eeaef8b13a7066067461eaf5994550934718667363a67cac5e0d838bc01f46b627cd09e959
+	b2sums = dc5ebe64a439595311311f25f8d765e1b6abfc4a0ce3e8c13b521d900fb231b287c0e7b18fc2f6534300322aac9a360d79fdfcfd81ae4824547477ea0e49a1fe
 
 pkgname = linux
 	pkgdesc = The Linux kernel and modules

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=linux
 pkgver=6.18.1.arch1
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux'
 url='https://github.com/archlinux/linux'
 arch=(x86_64)
@@ -29,7 +29,8 @@ makedepends=(
   texlive-latexextra
 )
 options=(
-  zipkmod
+  !debug
+  !strip
 )
 _srcname=linux-${pkgver%.*}
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -48,12 +49,12 @@ sha256sums=('d0a78bf3f0d12aaa10af3b5adcaed5bc767b5b78705e5ef885d5e930b72e25d5'
             'SKIP'
             'e0de7a4ccf2636993b2f49081399efaa63c0bf1c0db5cf1cbbdd6f8bfbede241'
             'SKIP'
-            '7f5793bfae1b8f02b5fb77b383e4b1cac82013efac1195ac317b9c44e19b7f1b')
+            '3061f542f99dd8dec161029e31dce15281cd99ec68e8403312d135ed13787dfd')
 b2sums=('6ea6a7235ee59f876b015c6fda0f2772980c6ea58240689ce581182262387cbef3aed3c95ced66cdb56479cbd83961fbcbdfdff09f049941c3daf047710adb61'
         'SKIP'
         '48a0b27d9c7ede9141fa581c2415f48d73e155d5afb515f9f10e0cd95947027464b3e2335bb5c275527007d9170889961858909520f2e6049ef2701cf4df9095'
         'SKIP'
-        '27ac52ad3c1ac815b2cf6a36e5b9963ba7fb069c8fc98961e0e979eeaef8b13a7066067461eaf5994550934718667363a67cac5e0d838bc01f46b627cd09e959')
+        'dc5ebe64a439595311311f25f8d765e1b6abfc4a0ce3e8c13b521d900fb231b287c0e7b18fc2f6534300322aac9a360d79fdfcfd81ae4824547477ea0e49a1fe')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -127,8 +128,8 @@ _package() {
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
-  # Suppress depmod
-  make INSTALL_MOD_PATH="$pkgdir/usr" DEPMOD=/doesnt/exist modules_install
+  ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+    DEPMOD=/doesnt/exist modules_install  # Suppress depmod
 
   # remove build link
   rm "$modulesdir"/build
@@ -202,6 +203,24 @@ _package-headers() {
   echo "Removing loose objects..."
   find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
 
+  echo "Stripping build tools..."
+  local file
+  while read -rd '' file; do
+    case "$(file -Sib "$file")" in
+      application/x-sharedlib\;*)      # Libraries (.so)
+        strip -v $STRIP_SHARED "$file" ;;
+      application/x-archive\;*)        # Libraries (.a)
+        strip -v $STRIP_STATIC "$file" ;;
+      application/x-executable\;*)     # Binaries
+        strip -v $STRIP_BINARIES "$file" ;;
+      application/x-pie-executable\;*) # Relocatable binaries
+        strip -v $STRIP_SHARED "$file" ;;
+    esac
+  done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
+
+  echo "Stripping vmlinux..."
+  strip -v $STRIP_STATIC "$builddir/vmlinux"
+
   echo "Adding symlink..."
   mkdir -p "$pkgdir/usr/src"
   ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"

config

@@ -1070,7 +1070,7 @@ CONFIG_MODULE_COMPRESS=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULE_COMPRESS_ZSTD=y
-# CONFIG_MODULE_COMPRESS_ALL is not set
+CONFIG_MODULE_COMPRESS_ALL=y
 CONFIG_MODULE_DECOMPRESS=y
 CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
@@ -2848,7 +2848,7 @@ CONFIG_DW_XDATA_PCIE=m
 CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_XILINX_SDFEC=m
 CONFIG_MISC_RTSX=m
-CONFIG_NTSYNC=y
+CONFIG_NTSYNC=m
 CONFIG_TPS6594_ESM=m
 CONFIG_TPS6594_PFSM=m
 CONFIG_NSM=m