From a7e2a17f9c0e55937ea3e18c4d5b905a8e4f8047 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Thu, 20 Mar 2025 20:50:08 +0100
Subject: [PATCH] config: Build in VIRTIO_BLK, VIRTIO_CONSOLE, BTRFS_FS and
EXT4_FS
Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/119
---
.SRCINFO | 4 ++--
PKGBUILD | 4 ++--
config | 32 ++++++++++++++++----------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 8ef7045..bbb3f2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -36,12 +36,12 @@ pkgbase = linux
sha256sums = SKIP
sha256sums = b38f80cf02f9af621ba305ec9ccf992f9f238eb5668110b15cc0c049139f0cd6
sha256sums = SKIP
- sha256sums = e371e59fba634b56b6cd99dff54f13437ca0c5fe95b27f115591f1b06cb01c7e
+ sha256sums = ccae8f9a7773146224f796b753d26031cdca8d859d1a1a787a00de54875e25ce
b2sums = dc9e71842d7e9d2e016ca2c6e791d627790c87cd445b404c73745dc565eb89617ec69f1150b228d7853a595ea7f6daf6acdb74f8383088af30d42bb4c062a129
b2sums = SKIP
b2sums = f2a05a124d4f5dc105c959f5dceef962f867877d451c053b1ba7cca50829b961d74ac3631a5fe06ed0b79ee9388cf9c2f37cffdbd63ab2515e25a0be21a1c77e
b2sums = SKIP
- b2sums = 0f51ac4a2500faa66377c6f90e0f9c433032c6836aa9b6772276fc5ad792fa0f8c15d68390191c2cc887cf3649186429438dacbd0df0f5b052647e3f98f4ad93
+ b2sums = 633dc89bae143933acfa5d32131e517b551e2cf2eceeb258a272131d9aa6e07dd9e07a27482aa6657bca09002a5cbe1447e7bf90d9a73a27a8c97bceb0c124ba
pkgname = linux
pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 5a2b720..26699b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -49,12 +49,12 @@ sha256sums=('3a39b62038b7ac2f43d26a1f84b4283e197804e1e817ad637e9a3d874c47801d'
'SKIP'
'b38f80cf02f9af621ba305ec9ccf992f9f238eb5668110b15cc0c049139f0cd6'
'SKIP'
- 'e371e59fba634b56b6cd99dff54f13437ca0c5fe95b27f115591f1b06cb01c7e')
+ 'ccae8f9a7773146224f796b753d26031cdca8d859d1a1a787a00de54875e25ce')
b2sums=('dc9e71842d7e9d2e016ca2c6e791d627790c87cd445b404c73745dc565eb89617ec69f1150b228d7853a595ea7f6daf6acdb74f8383088af30d42bb4c062a129'
'SKIP'
'f2a05a124d4f5dc105c959f5dceef962f867877d451c053b1ba7cca50829b961d74ac3631a5fe06ed0b79ee9388cf9c2f37cffdbd63ab2515e25a0be21a1c77e'
'SKIP'
- '0f51ac4a2500faa66377c6f90e0f9c433032c6836aa9b6772276fc5ad792fa0f8c15d68390191c2cc887cf3649186429438dacbd0df0f5b052647e3f98f4ad93')
+ '633dc89bae143933acfa5d32131e517b551e2cf2eceeb258a272131d9aa6e07dd9e07a27482aa6657bca09002a5cbe1447e7bf90d9a73a27a8c97bceb0c124ba')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 7c5d970..9421ff2 100644
--- a/config
+++ b/config
@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=24400
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24400
CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108500
+CONFIG_RUSTC_VERSION=108501
CONFIG_RUST_IS_AVAILABLE=y
CONFIG_RUSTC_LLVM_VERSION=190107
CONFIG_CC_CAN_LINK=y
@@ -324,7 +324,7 @@ CONFIG_PERF_EVENTS=y
CONFIG_SYSTEM_DATA_VERIFICATION=y
CONFIG_PROFILING=y
CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.85.0 (4d91de4e4 2025-02-17) (Arch Linux rust 1:1.85.0-1)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.85.1 (4eb161250 2025-03-15) (Arch Linux rust 1:1.85.1-1)"
CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.71.1"
CONFIG_TRACEPOINTS=y
@@ -2701,7 +2701,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_ATA_OVER_ETH=m
CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_RUST_NULL is not set
CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_UBLK=m
@@ -4740,7 +4740,7 @@ CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
CONFIG_PRINTER=m
CONFIG_LP_CONSOLE=y
CONFIG_PPDEV=m
-CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_CONSOLE=y
CONFIG_IPMI_HANDLER=m
CONFIG_IPMI_DMI_DECODE=y
CONFIG_IPMI_PLAT_DATA=y
@@ -10673,14 +10673,14 @@ CONFIG_BUFFER_HEAD=y
CONFIG_LEGACY_DIRECT_IO=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
+CONFIG_JBD2=y
# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
+CONFIG_FS_MBCACHE=y
CONFIG_JFS_FS=m
CONFIG_JFS_POSIX_ACL=y
CONFIG_JFS_SECURITY=y
@@ -10709,7 +10709,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCFS2_FS_STATS=y
CONFIG_OCFS2_DEBUG_MASKLOG=y
# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS=y
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
@@ -10750,7 +10750,7 @@ CONFIG_EXPORTFS=y
CONFIG_EXPORTFS_BLOCK_OPS=y
CONFIG_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_ALGS=y
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
CONFIG_FS_VERITY=y
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
@@ -11211,7 +11211,7 @@ CONFIG_RANDSTRUCT_NONE=y
# end of Kernel hardening options
# end of Security options
-CONFIG_XOR_BLOCKS=m
+CONFIG_XOR_BLOCKS=y
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_XOR=m
@@ -11322,7 +11322,7 @@ CONFIG_CRYPTO_ESSIV=m
#
# Hashes, digests, and MACs
#
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
@@ -11342,13 +11342,13 @@ CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_VMAC=m
CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
# end of Hashes, digests, and MACs
#
# CRCs (cyclic redundancy checks)
#
-CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRCT10DIF=y
CONFIG_CRYPTO_CRC64_ROCKSOFT=y
@@ -11499,7 +11499,7 @@ CONFIG_BINARY_PRINTF=y
#
# Library routines
#
-CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ=y
# CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_LINEAR_RANGES=y
CONFIG_PACKING=y
@@ -11543,7 +11543,7 @@ CONFIG_CRYPTO_LIB_SHA256=y
# end of Crypto library routines
CONFIG_CRC_CCITT=y
-CONFIG_CRC16=m
+CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y
CONFIG_CRC64_ROCKSOFT=y
CONFIG_CRC_ITU_T=m
@@ -11556,7 +11556,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC64=y
CONFIG_CRC4=m
CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
CONFIG_CRC8=m
CONFIG_XXHASH=y
# CONFIG_RANDOM32_SELFTEST is not set