Merge remote-tracking branch 'upstream/main'

Disable module compression and add zipkmod option for compressing
modules.

Signed-off-by: Vasiliy Stelmachenok <ventureo@yandex.ru>

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = linux
 	pkgdesc = Linux
-	pkgver = 6.15.6.arch1
+	pkgver = 6.18.arch1
 	pkgrel = 1
 	url = https://github.com/archlinux/linux
 	arch = x86_64
@@ -22,26 +22,25 @@ pkgbase = linux
 	makedepends = python-sphinx
 	makedepends = python-yaml
 	makedepends = texlive-latexextra
-	options = !debug
-	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.6.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.6.tar.sign
-	source = https://github.com/archlinux/linux/releases/download/v6.15.6-arch1/linux-v6.15.6-arch1.patch.zst
-	source = https://github.com/archlinux/linux/releases/download/v6.15.6-arch1/linux-v6.15.6-arch1.patch.zst.sig
+	options = zipkmod
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.tar.sign
+	source = https://github.com/archlinux/linux/releases/download/v6.18-arch1/linux-v6.18-arch1.patch.zst
+	source = https://github.com/archlinux/linux/releases/download/v6.18-arch1/linux-v6.18-arch1.patch.zst.sig
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF
-	sha256sums = 2bb586c954277d070c8fdf6d7275faa93b4807d9bf3353b491d8149cca02b4fc
+	sha256sums = 9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b
 	sha256sums = SKIP
-	sha256sums = 2e41f4218472b46451af3718ce0951d908ad0356ac3a65f3a81b9ae932b24ad0
+	sha256sums = 1461db929834dad3b39595dcff5650afcb69465be1f3a11d6f63e89ed3904910
 	sha256sums = SKIP
-	sha256sums = 95a2848c23e99e7987ef73afc9fcd038f2460168fd1c56b1cb59faebe4fb599d
-	b2sums = 34301ec451141cab53c6017445fb78c6a681095604387b20060e8b2102d9677cf25a3af9f3db56a0b88772434179f730842bce67b718cd28998e5c56178c748a
+	sha256sums = 862ba1d840619a220e126759b7a1632432747a051d4eddba44a656823176b013
+	b2sums = b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f
 	b2sums = SKIP
-	b2sums = caff0a73f3eb6152fcc9fd9972328321dfab6437a60ba93501bc44452e09382a2865e9672218645aa145bf6cd9600d77b472691d2199ac8229e18d77c3a9b7b4
+	b2sums = 38b85a7633fb194bd77786963d123c5439e0e8b73ba2beeb9f1c465daf9a9798014f3b342a90d2bfb3d31aed349114ab7245f1a3fbf864546a503199b2ac956b
 	b2sums = SKIP
-	b2sums = f0624f70c2a2396b28b3346140226cfef8896775b4a1bfe79e1db0b2a9e6ad3508f9688636c390cfa68edccb8eb4e592fdee69f9fe3307139b6a222e18b45f8b
+	b2sums = 1a1c39c04046ce3a3f6ecb0c38d36c8c766c641c534f76a2a10b60dd9e5db6d57339eb024e78da744cff958187061ed218aeadcbb7dc74cb536b4dfbfd7b24bf
 
 pkgname = linux
 	pkgdesc = The Linux kernel and modules

.gitignore

@@ -1,4 +1,3 @@
-*.zst
-src
-*.tar.*
-*.sig
+/*.old
+/*.orig
+/*.rej

.nvchecker.toml

@@ -1,7 +1,6 @@
 [linux]
-source = "github"
-github = "archlinux/linux"
-use_max_tag = true
+source = "git"
+git = "https://github.com/archlinux/linux.git"
 include_regex = 'v\d+(\.\d+)*-arch\d+'
 from_pattern = '-([a-z])'
 to_pattern = '.\1'

LICENSE

@@ -0,0 +1,12 @@
+Copyright Arch Linux Contributors
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

LICENSES/0BSD.txt

@@ -0,0 +1 @@
+../LICENSE

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux
-pkgver=6.15.6.arch1
+pkgver=6.18.arch1
 pkgrel=1
 pkgdesc='Linux'
 url='https://github.com/archlinux/linux'
@@ -29,8 +29,7 @@ makedepends=(
   texlive-latexextra
 )
 options=(
-  !debug
-  !strip
+  zipkmod
 )
 _srcname=linux-${pkgver%.*}
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -45,16 +44,16 @@ validpgpkeys=(
   83BC8889351B5DEBBB68416EB8AC08600F108CDF  # Jan Alexander Steffens (heftig)
 )
 # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256sums=('2bb586c954277d070c8fdf6d7275faa93b4807d9bf3353b491d8149cca02b4fc'
+sha256sums=('9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b'
             'SKIP'
-            '2e41f4218472b46451af3718ce0951d908ad0356ac3a65f3a81b9ae932b24ad0'
+            '1461db929834dad3b39595dcff5650afcb69465be1f3a11d6f63e89ed3904910'
             'SKIP'
-            '95a2848c23e99e7987ef73afc9fcd038f2460168fd1c56b1cb59faebe4fb599d')
-b2sums=('34301ec451141cab53c6017445fb78c6a681095604387b20060e8b2102d9677cf25a3af9f3db56a0b88772434179f730842bce67b718cd28998e5c56178c748a'
+            '862ba1d840619a220e126759b7a1632432747a051d4eddba44a656823176b013')
+b2sums=('b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f'
         'SKIP'
-        'caff0a73f3eb6152fcc9fd9972328321dfab6437a60ba93501bc44452e09382a2865e9672218645aa145bf6cd9600d77b472691d2199ac8229e18d77c3a9b7b4'
+        '38b85a7633fb194bd77786963d123c5439e0e8b73ba2beeb9f1c465daf9a9798014f3b342a90d2bfb3d31aed349114ab7245f1a3fbf864546a503199b2ac956b'
         'SKIP'
-        'f0624f70c2a2396b28b3346140226cfef8896775b4a1bfe79e1db0b2a9e6ad3508f9688636c390cfa68edccb8eb4e592fdee69f9fe3307139b6a222e18b45f8b')
+        '1a1c39c04046ce3a3f6ecb0c38d36c8c766c641c534f76a2a10b60dd9e5db6d57339eb024e78da744cff958187061ed218aeadcbb7dc74cb536b4dfbfd7b24bf')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -90,7 +89,7 @@ build() {
   cd $_srcname
   make all
   make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
-  make htmldocs
+  make htmldocs SPHINXOPTS=-QT
 }
 
 _package() {
@@ -128,8 +127,8 @@ _package() {
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
-  ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
-    DEPMOD=/doesnt/exist modules_install  # Suppress depmod
+  # Suppress depmod
+  make INSTALL_MOD_PATH="$pkgdir/usr" DEPMOD=/doesnt/exist modules_install
 
   # remove build link
   rm "$modulesdir"/build
@@ -203,24 +202,6 @@ _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"

REUSE.toml

@@ -0,0 +1,24 @@
+version = 1
+
+[[annotations]]
+path = [
+    "PKGBUILD",
+    "README.md",
+    "keys/**",
+    ".SRCINFO",
+    ".nvchecker.toml",
+    "*.install",
+    "*.sysusers",
+    "*.tmpfiles",
+    "*.logrotate",
+    "*.pam",
+    "*.service",
+    "*.socket",
+    "*.timer",
+    "*.desktop",
+    "*.hook",
+    "config",
+    ".gitignore",
+]
+SPDX-FileCopyrightText = "Arch Linux contributors"
+SPDX-License-Identifier = "0BSD"