From 026a6bc89233f04bb57de16569999e0c7219933e Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 10 Jun 2025 23:28:05 +0200 Subject: [PATCH 1/2] config: Disable NOVA_CORE Breaks both nouveau and the proprietary nvidia driver. Closes: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/143 See: https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia/-/issues/15#note_276495 --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- config | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c5f29ef..28b2c37 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -36,12 +36,12 @@ pkgbase = linux sha256sums = SKIP sha256sums = cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1 sha256sums = SKIP - sha256sums = 85c4e091c0c8a0f189c1c61603b774442b8b375f7232e2f779296bc4418c428f + sha256sums = 72e2e05a5e2f2c87a1c95d54e282ee23bb3cfbc7800bfd98b0bab56d22c93ecb b2sums = bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24 b2sums = SKIP b2sums = 2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5 b2sums = SKIP - b2sums = a2644043800a384d40677ed957c5c9cbd70600b20f700fa5c3e84684574da7496f8a17b10f2984a15a918ef60211db08996cb189daf3a98cbb8bb5cbad0a8512 + b2sums = 8b4bdd56381f48a319b85c3047660294d1baecdac05ac4ea4c626234e7d51bf5c125043267c59fbcca706825e149a7d976f835e1df74a405fcfa87fe20c64f3c pkgname = linux pkgdesc = The Linux kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 115d148..32cf80f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -49,12 +49,12 @@ sha256sums=('44f1bb84fe512e7bafe0e6dc85d38ec1c6c8fcbe97ccb51d8c19930b799f0d64' 'SKIP' 'cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1' 'SKIP' - '85c4e091c0c8a0f189c1c61603b774442b8b375f7232e2f779296bc4418c428f') + '72e2e05a5e2f2c87a1c95d54e282ee23bb3cfbc7800bfd98b0bab56d22c93ecb') b2sums=('bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24' 'SKIP' '2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5' 'SKIP' - 'a2644043800a384d40677ed957c5c9cbd70600b20f700fa5c3e84684574da7496f8a17b10f2984a15a918ef60211db08996cb189daf3a98cbb8bb5cbad0a8512') + '8b4bdd56381f48a319b85c3047660294d1baecdac05ac4ea4c626234e7d51bf5c125043267c59fbcca706825e149a7d976f835e1df74a405fcfa87fe20c64f3c') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/config b/config index 51b38ff..7777fad 100644 --- a/config +++ b/config @@ -6990,7 +6990,7 @@ CONFIG_AGP_SIS=m CONFIG_AGP_VIA=m CONFIG_INTEL_GTT=m CONFIG_VGA_SWITCHEROO=y -CONFIG_NOVA_CORE=m +# CONFIG_NOVA_CORE is not set CONFIG_DRM=y CONFIG_DRM_MIPI_DBI=m CONFIG_DRM_MIPI_DSI=y From f59da9230f34cc2003304e376c693e763eae307a Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 10 Jun 2025 23:31:21 +0200 Subject: [PATCH 2/2] 6.15.2.arch1-1 --- .SRCINFO | 24 ++++++++++++------------ PKGBUILD | 16 ++++++++-------- config | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 28b2c37..1eaa523 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux pkgdesc = Linux - pkgver = 6.15.1.arch1 - pkgrel = 2 + pkgver = 6.15.2.arch1 + pkgrel = 1 url = https://github.com/archlinux/linux arch = x86_64 license = GPL-2.0-only @@ -24,24 +24,24 @@ pkgbase = linux makedepends = texlive-latexextra options = !debug options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.1.tar.xz - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.1.tar.sign - source = https://github.com/archlinux/linux/releases/download/v6.15.1-arch1/linux-v6.15.1-arch1.patch.zst - source = https://github.com/archlinux/linux/releases/download/v6.15.1-arch1/linux-v6.15.1-arch1.patch.zst.sig + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.2.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.15.2.tar.sign + source = https://github.com/archlinux/linux/releases/download/v6.15.2-arch1/linux-v6.15.2-arch1.patch.zst + source = https://github.com/archlinux/linux/releases/download/v6.15.2-arch1/linux-v6.15.2-arch1.patch.zst.sig source = config validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF - sha256sums = 44f1bb84fe512e7bafe0e6dc85d38ec1c6c8fcbe97ccb51d8c19930b799f0d64 + sha256sums = 3458cd6a6c508e161dbc5406e72b99d5dbdf929faf704a67db9ba46d07514858 sha256sums = SKIP - sha256sums = cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1 + sha256sums = f4b5d9d02a539cdfd214f7e40d231b098356557772d5b8179b99442564899602 sha256sums = SKIP - sha256sums = 72e2e05a5e2f2c87a1c95d54e282ee23bb3cfbc7800bfd98b0bab56d22c93ecb - b2sums = bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24 + sha256sums = b91f05f010dbf6786026278c2e095201c9b043c91d9a2065fc4de2d28d0dcb37 + b2sums = c2b23abc39af6d2cf67f5963121f16d4a231869203d3915ed6260d6f39ef0d7dbd5c86abac9cc6f9af5b00f8ad6c754f212bdde1d670e60e3a91866718980799 b2sums = SKIP - b2sums = 2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5 + b2sums = 222a3a2dd3b82c5dedadb0bcac3817a480a5d7fad91b6e5233b8bd7caeaf741da35edc40d4a8f27bf6c6d2cd46b331547847091b60e270b7fd0aa049ec01f554 b2sums = SKIP - b2sums = 8b4bdd56381f48a319b85c3047660294d1baecdac05ac4ea4c626234e7d51bf5c125043267c59fbcca706825e149a7d976f835e1df74a405fcfa87fe20c64f3c + b2sums = 42dec5145b1e1af5a0019e6a76c91eabc87c6dbc701398a072fdc65376179bb0fd3f8d6f17515be831be86ac1e9dbaa7eb6cf74ca70d34a26e17e5e7bdfb62a4 pkgname = linux pkgdesc = The Linux kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 32cf80f..89e968d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux -pkgver=6.15.1.arch1 -pkgrel=2 +pkgver=6.15.2.arch1 +pkgrel=1 pkgdesc='Linux' url='https://github.com/archlinux/linux' arch=(x86_64) @@ -45,16 +45,16 @@ validpgpkeys=( 83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig) ) # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256sums=('44f1bb84fe512e7bafe0e6dc85d38ec1c6c8fcbe97ccb51d8c19930b799f0d64' +sha256sums=('3458cd6a6c508e161dbc5406e72b99d5dbdf929faf704a67db9ba46d07514858' 'SKIP' - 'cb29546b25147d93ad4f8e1a65ffda76bcaf83c31387662d255fbf165fa541c1' + 'f4b5d9d02a539cdfd214f7e40d231b098356557772d5b8179b99442564899602' 'SKIP' - '72e2e05a5e2f2c87a1c95d54e282ee23bb3cfbc7800bfd98b0bab56d22c93ecb') -b2sums=('bce19089e6c7b7e6f905855940b69a6edb68818caa25de866a3673082ec9e8ad95f842689db185a9271eac5cccd122212c05711f99b4d0c2e0a1b7abc895bc24' + 'b91f05f010dbf6786026278c2e095201c9b043c91d9a2065fc4de2d28d0dcb37') +b2sums=('c2b23abc39af6d2cf67f5963121f16d4a231869203d3915ed6260d6f39ef0d7dbd5c86abac9cc6f9af5b00f8ad6c754f212bdde1d670e60e3a91866718980799' 'SKIP' - '2926aac823113789861daebf888edcf2348262c99e369039565a7ad4b532c10f3b6953c79449c9865c344ee0bd21c1ee1ac48e29c4e3f6d81c3a0c433ed9ceb5' + '222a3a2dd3b82c5dedadb0bcac3817a480a5d7fad91b6e5233b8bd7caeaf741da35edc40d4a8f27bf6c6d2cd46b331547847091b60e270b7fd0aa049ec01f554' 'SKIP' - '8b4bdd56381f48a319b85c3047660294d1baecdac05ac4ea4c626234e7d51bf5c125043267c59fbcca706825e149a7d976f835e1df74a405fcfa87fe20c64f3c') + '42dec5145b1e1af5a0019e6a76c91eabc87c6dbc701398a072fdc65376179bb0fd3f8d6f17515be831be86ac1e9dbaa7eb6cf74ca70d34a26e17e5e7bdfb62a4') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/config b/config index 7777fad..91b6dbf 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.15.1-arch1 Kernel Configuration +# Linux/x86 6.15.2-arch1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.1.1 20250425" CONFIG_CC_IS_GCC=y @@ -327,7 +327,7 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_RUST=y CONFIG_RUSTC_VERSION_TEXT="rustc 1.87.0 (17067e9ac 2025-05-09) (Arch Linux rust 1:1.87.0-2)" -CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.71.1" +CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.72.0" CONFIG_TRACEPOINTS=y #