Cleanups and braking down kern conf a bit.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
pkgbase = linux-kira-lts
|
||||
pkgdesc = Kira LTS Linux
|
||||
pkgver = 6.18.41
|
||||
pkgrel = 3
|
||||
pkgrel = 5
|
||||
url = https://www.kernel.org
|
||||
arch = x86_64
|
||||
makedepends = bzz-initrd
|
||||
@@ -38,6 +38,7 @@ pkgbase = linux-kira-lts
|
||||
source = 0003-drm-amdgpu-use-GFP_ATOMIC-instead-of-NOWAIT-in-the-critical-path.patch
|
||||
source = kira_config_x86_64_base
|
||||
source = kira_config_x86_64_smol.fragment
|
||||
source = kira_disable_guest_vm.fragment
|
||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
sha256sums = 17fc72f0f8d4a8a8633a5d20085f5d9c5a5ec51ee896a0b7ae1ec25da31273ea
|
||||
@@ -46,16 +47,18 @@ pkgbase = linux-kira-lts
|
||||
sha256sums = e5bda61fa4405571a0267cd8812329bb8a432a37efb50459461628d371849906
|
||||
sha256sums = c31b8c0ace123f5c1a0012a1254272eea9ac9cdd0d3e5d538ca6b11830dd01b0
|
||||
sha256sums = 0f482368b62c3cece941e2d3ba497bf322db59315df5c2f72500fc1318e4768e
|
||||
sha256sums = 3c3b6aaf1bd91400465730b69fdc705e774dbeba29f814b15dbc0a919a208f68
|
||||
sha256sums = 77dad09f37f721327729294a2d827766c01dd5f20f4d57cbc119e45aa7593ade
|
||||
sha256sums = a4a871dacc206d70527438272130f1ca04dbe3500e73309d21370ca1864c2e03
|
||||
sha256sums = 3d9965a4126af3ab86a13eef5255511219ee11863151a6e78e08119775f0c002
|
||||
sha256sums = c6aa9877b0612805690d8abfc13c941530a11a7b56979d814e674c86c42ca0cf
|
||||
b2sums = 004e68e62fc813cef33b08c993c5a7164a578e68195ba831c4cd654e8624004049e9486ec96ed7e5dbb9f983a06ba2ec4a624adeb01339ed690d4990c39449bd
|
||||
b2sums = SKIP
|
||||
b2sums = 3dd8bbe1b3306e5f20d9c04d7e8f775e9be73e36b4b81868d1336969a24d143219db6b6d6580786761c2e7c5b129bfedb9dd3a9025d648acc35727cb3dba4695
|
||||
b2sums = 5b3597cab8b174ff41b3f17aae6d1376a155356f781542e2e176d66c5a6dee53f7a1db8e2b9540ce8246efac4e27476c882fc8cc8063f0f514ae09230b5aef0a
|
||||
b2sums = a71f78bea42d158fc9383f2bbb985dafa71274d2032876b67f84602c8085b1c53f3d36965e54e5fdbab5c0d7537c98d917bd7743d3cf373c1dcb6da3bc19f4e7
|
||||
b2sums = c9d4ec8fac86a9b6f0567c57f6d5be04d56f8efbc9dc1b183981dad38387d750b53c17fcdd295cb68a874bf50f81d117cfe94bd3a8d9e08e1918644ae8daa3e5
|
||||
b2sums = 0fc523fd9fba1d082c7251cce02eb62579f93be52b2e58fa1918025b8899c3b8ea7c3fcbc75cc4e24bb6d54dac9f729a57d0cd546f7798e4a3427cf702b85ea7
|
||||
b2sums = de4fcf849266fc5ade0e7032be61493c4fe4b61a2bf4c3d179faf22b25ecffb821b13e71c075a05413966d95ef87a0841d88730f50d69dfc09d69cf3891ec2e6
|
||||
b2sums = e94543206de5128f97cd6ee38b8165d3463237ceca6e03f87b84fd047c96808d17222a6f8bf2ff601d301730be9e3eeba44183c2bc908a4eb8ad5d7003ca2aff
|
||||
b2sums = f15503d1d297cbdec05932ce19cf606aeb47661d65d02907ae859c1584439c214fae1f1521e87ddcaaf1f11585c7c78b932992c6da00c6f21cbb673cb059f788
|
||||
b2sums = 2d581d66fe4e4afe0158755f5ea0cd0df9765b63464cb81e2b9115a37230e4489f16526393c47009c4392e5de70d2d37e496f764ad89e214ec7010c5bbfbcfc1
|
||||
|
||||
pkgname = linux-kira-lts
|
||||
pkgdesc = The Kira LTS Linux kernel and modules
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
pkgbase=linux-kira-lts
|
||||
pkgver=6.18.41
|
||||
pkgrel=3
|
||||
pkgrel=5
|
||||
pkgdesc='Kira LTS Linux'
|
||||
url='https://www.kernel.org'
|
||||
_bcachefs_ver=1.38.8
|
||||
@@ -51,6 +51,7 @@ source=(
|
||||
0003-drm-amdgpu-use-GFP_ATOMIC-instead-of-NOWAIT-in-the-critical-path.patch
|
||||
kira_config_x86_64_base
|
||||
kira_config_x86_64_smol.fragment
|
||||
kira_disable_guest_vm.fragment
|
||||
)
|
||||
validpgpkeys=(
|
||||
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
||||
@@ -64,16 +65,19 @@ sha256sums=('17fc72f0f8d4a8a8633a5d20085f5d9c5a5ec51ee896a0b7ae1ec25da31273ea'
|
||||
'e5bda61fa4405571a0267cd8812329bb8a432a37efb50459461628d371849906'
|
||||
'c31b8c0ace123f5c1a0012a1254272eea9ac9cdd0d3e5d538ca6b11830dd01b0'
|
||||
'0f482368b62c3cece941e2d3ba497bf322db59315df5c2f72500fc1318e4768e'
|
||||
'3c3b6aaf1bd91400465730b69fdc705e774dbeba29f814b15dbc0a919a208f68'
|
||||
'77dad09f37f721327729294a2d827766c01dd5f20f4d57cbc119e45aa7593ade')
|
||||
'a4a871dacc206d70527438272130f1ca04dbe3500e73309d21370ca1864c2e03'
|
||||
'3d9965a4126af3ab86a13eef5255511219ee11863151a6e78e08119775f0c002'
|
||||
'c6aa9877b0612805690d8abfc13c941530a11a7b56979d814e674c86c42ca0cf')
|
||||
b2sums=('004e68e62fc813cef33b08c993c5a7164a578e68195ba831c4cd654e8624004049e9486ec96ed7e5dbb9f983a06ba2ec4a624adeb01339ed690d4990c39449bd'
|
||||
'SKIP'
|
||||
'3dd8bbe1b3306e5f20d9c04d7e8f775e9be73e36b4b81868d1336969a24d143219db6b6d6580786761c2e7c5b129bfedb9dd3a9025d648acc35727cb3dba4695'
|
||||
'5b3597cab8b174ff41b3f17aae6d1376a155356f781542e2e176d66c5a6dee53f7a1db8e2b9540ce8246efac4e27476c882fc8cc8063f0f514ae09230b5aef0a'
|
||||
'a71f78bea42d158fc9383f2bbb985dafa71274d2032876b67f84602c8085b1c53f3d36965e54e5fdbab5c0d7537c98d917bd7743d3cf373c1dcb6da3bc19f4e7'
|
||||
'c9d4ec8fac86a9b6f0567c57f6d5be04d56f8efbc9dc1b183981dad38387d750b53c17fcdd295cb68a874bf50f81d117cfe94bd3a8d9e08e1918644ae8daa3e5'
|
||||
'0fc523fd9fba1d082c7251cce02eb62579f93be52b2e58fa1918025b8899c3b8ea7c3fcbc75cc4e24bb6d54dac9f729a57d0cd546f7798e4a3427cf702b85ea7'
|
||||
'de4fcf849266fc5ade0e7032be61493c4fe4b61a2bf4c3d179faf22b25ecffb821b13e71c075a05413966d95ef87a0841d88730f50d69dfc09d69cf3891ec2e6')
|
||||
'e94543206de5128f97cd6ee38b8165d3463237ceca6e03f87b84fd047c96808d17222a6f8bf2ff601d301730be9e3eeba44183c2bc908a4eb8ad5d7003ca2aff'
|
||||
'f15503d1d297cbdec05932ce19cf606aeb47661d65d02907ae859c1584439c214fae1f1521e87ddcaaf1f11585c7c78b932992c6da00c6f21cbb673cb059f788'
|
||||
'2d581d66fe4e4afe0158755f5ea0cd0df9765b63464cb81e2b9115a37230e4489f16526393c47009c4392e5de70d2d37e496f764ad89e214ec7010c5bbfbcfc1')
|
||||
|
||||
export KBUILD_BUILD_HOST=kiralinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
||||
@@ -113,11 +117,15 @@ prepare() {
|
||||
|
||||
#No need to apply this unless something changes
|
||||
|
||||
echo "Apply kira_config_x86_64_smol.fragment"
|
||||
echo "################## Apply kira_config_x86_64_smol.fragment ################## "
|
||||
./scripts/kconfig/merge_config.sh .config "$srcdir/kira_config_x86_64_smol.fragment"
|
||||
#diff -u ../kira_config_x86_64_base .config || :
|
||||
echo "################## DONE Apply kira_config_x86_64_smol.fragment #####################"
|
||||
echo ""
|
||||
|
||||
echo "################## Apply kira_disable_guest_vm.fragment ##################"
|
||||
./scripts/kconfig/merge_config.sh .config "$srcdir/kira_disable_guest_vm.fragment"
|
||||
echo "################## DONE Apply kira_disable_guest_vm.fragment #####################"
|
||||
echo ""
|
||||
|
||||
make -s kernelrelease > version
|
||||
echo "Prepared $pkgbase version $(<version)"
|
||||
|
||||
+9
-24
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 6.18.39 Kernel Configuration
|
||||
# Linux/x86 6.18.41 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 16.1.1 20260625"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -404,12 +404,12 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
|
||||
CONFIG_X86_DEBUGCTLMSR=y
|
||||
CONFIG_IA32_FEAT_CTL=y
|
||||
CONFIG_X86_VMX_FEATURE_NAMES=y
|
||||
CONFIG_BROADCAST_TLB_FLUSH=y
|
||||
CONFIG_CPU_SUP_INTEL=y
|
||||
CONFIG_CPU_SUP_AMD=y
|
||||
CONFIG_CPU_SUP_HYGON=y
|
||||
CONFIG_CPU_SUP_CENTAUR=y
|
||||
CONFIG_CPU_SUP_ZHAOXIN=y
|
||||
CONFIG_BROADCAST_TLB_FLUSH=y
|
||||
CONFIG_HPET_TIMER=y
|
||||
CONFIG_HPET_EMULATE_RTC=y
|
||||
CONFIG_DMI=y
|
||||
@@ -1980,7 +1980,6 @@ CONFIG_VSOCKETS_LOOPBACK=m
|
||||
# CONFIG_VMWARE_VMCI_VSOCKETS is not set
|
||||
CONFIG_VIRTIO_VSOCKETS=m
|
||||
CONFIG_VIRTIO_VSOCKETS_COMMON=m
|
||||
# CONFIG_HYPERV_VSOCKETS is not set
|
||||
CONFIG_NETLINK_DIAG=m
|
||||
CONFIG_MPLS=y
|
||||
CONFIG_NET_MPLS_GSO=m
|
||||
@@ -2260,7 +2259,6 @@ CONFIG_PCI_PRI=y
|
||||
CONFIG_PCI_PASID=y
|
||||
# CONFIG_PCIE_TPH is not set
|
||||
CONFIG_PCI_LABEL=y
|
||||
CONFIG_PCI_HYPERV=m
|
||||
CONFIG_VGA_ARB=y
|
||||
CONFIG_VGA_ARB_MAX_GPUS=10
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
@@ -2276,7 +2274,6 @@ CONFIG_HOTPLUG_PCI_SHPC=y
|
||||
# PCI controller drivers
|
||||
#
|
||||
CONFIG_VMD=m
|
||||
CONFIG_PCI_HYPERV_INTERFACE=m
|
||||
|
||||
#
|
||||
# Cadence-based PCIe controllers
|
||||
@@ -2928,7 +2925,6 @@ CONFIG_SCSI_FLASHPOINT=y
|
||||
CONFIG_SCSI_MYRB=m
|
||||
CONFIG_SCSI_MYRS=m
|
||||
CONFIG_VMWARE_PVSCSI=m
|
||||
CONFIG_HYPERV_STORAGE=m
|
||||
CONFIG_LIBFC=m
|
||||
CONFIG_LIBFCOE=m
|
||||
CONFIG_FCOE=m
|
||||
@@ -3548,7 +3544,6 @@ CONFIG_VCAP=y
|
||||
CONFIG_NET_VENDOR_MICROSEMI=y
|
||||
CONFIG_MSCC_OCELOT_SWITCH_LIB=m
|
||||
CONFIG_NET_VENDOR_MICROSOFT=y
|
||||
# CONFIG_MICROSOFT_MANA is not set
|
||||
CONFIG_NET_VENDOR_MYRI=y
|
||||
CONFIG_MYRI10GE=m
|
||||
CONFIG_MYRI10GE_DCA=y
|
||||
@@ -4302,7 +4297,6 @@ CONFIG_MTK_T7XX=m
|
||||
CONFIG_VMXNET3=m
|
||||
CONFIG_FUJITSU_ES=m
|
||||
CONFIG_USB4_NET=m
|
||||
CONFIG_HYPERV_NET=m
|
||||
CONFIG_NETDEVSIM=m
|
||||
CONFIG_NET_FAILOVER=m
|
||||
CONFIG_ISDN=y
|
||||
@@ -4647,7 +4641,6 @@ CONFIG_SERIO_RAW=m
|
||||
CONFIG_SERIO_ALTERA_PS2=m
|
||||
CONFIG_SERIO_PS2MULT=m
|
||||
CONFIG_SERIO_ARC_PS2=m
|
||||
CONFIG_HYPERV_KEYBOARD=m
|
||||
CONFIG_SERIO_GPIO_PS2=m
|
||||
CONFIG_USERIO=m
|
||||
CONFIG_GAMEPORT=m
|
||||
@@ -7156,7 +7149,6 @@ CONFIG_DRM_GUD=m
|
||||
CONFIG_DRM_SSD130X=m
|
||||
CONFIG_DRM_SSD130X_I2C=m
|
||||
CONFIG_DRM_SSD130X_SPI=m
|
||||
CONFIG_DRM_HYPERV=m
|
||||
CONFIG_DRM_PANEL_BACKLIGHT_QUIRKS=m
|
||||
CONFIG_DRM_PRIVACY_SCREEN=y
|
||||
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
|
||||
@@ -7206,7 +7198,6 @@ CONFIG_FB_EFI=y
|
||||
# CONFIG_FB_VIRTUAL is not set
|
||||
# CONFIG_FB_METRONOME is not set
|
||||
# CONFIG_FB_MB862XX is not set
|
||||
# CONFIG_FB_HYPERV is not set
|
||||
# CONFIG_FB_SSD1307 is not set
|
||||
# CONFIG_FB_SM712 is not set
|
||||
CONFIG_FB_CORE=y
|
||||
@@ -8352,7 +8343,6 @@ CONFIG_HID_SUNPLUS=m
|
||||
CONFIG_HID_RMI=m
|
||||
CONFIG_HID_GREENASIA=m
|
||||
CONFIG_GREENASIA_FF=y
|
||||
# CONFIG_HID_HYPERV_MOUSE is not set
|
||||
CONFIG_HID_SMARTJOYPLUS=m
|
||||
CONFIG_SMARTJOYPLUS_FF=y
|
||||
CONFIG_HID_TIVO=m
|
||||
@@ -9380,13 +9370,7 @@ CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
|
||||
#
|
||||
# Microsoft Hyper-V guest support
|
||||
#
|
||||
CONFIG_HYPERV=y
|
||||
# CONFIG_HYPERV_VTL_MODE is not set
|
||||
CONFIG_HYPERV_TIMER=y
|
||||
CONFIG_HYPERV_UTILS=m
|
||||
CONFIG_HYPERV_BALLOON=m
|
||||
CONFIG_HYPERV_VMBUS=m
|
||||
CONFIG_MSHV_ROOT=m
|
||||
# CONFIG_HYPERV is not set
|
||||
# end of Microsoft Hyper-V guest support
|
||||
|
||||
# CONFIG_GREYBUS is not set
|
||||
@@ -9865,7 +9849,6 @@ CONFIG_INTEL_IOMMU_PERF_EVENTS=y
|
||||
CONFIG_IOMMUFD_DRIVER_CORE=y
|
||||
CONFIG_IOMMUFD=m
|
||||
CONFIG_IRQ_REMAP=y
|
||||
CONFIG_HYPERV_IOMMU=y
|
||||
CONFIG_VIRTIO_IOMMU=m
|
||||
|
||||
#
|
||||
@@ -11509,10 +11492,13 @@ CONFIG_CRYPTO_KDF800108_CTR=y
|
||||
#
|
||||
# Userspace interface
|
||||
#
|
||||
# CONFIG_CRYPTO_USER_API_HASH is not set
|
||||
# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
|
||||
# CONFIG_CRYPTO_USER_API_RNG is not set
|
||||
CONFIG_CRYPTO_USER_API=y
|
||||
CONFIG_CRYPTO_USER_API_HASH=y
|
||||
CONFIG_CRYPTO_USER_API_SKCIPHER=y
|
||||
CONFIG_CRYPTO_USER_API_RNG=y
|
||||
# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
|
||||
# CONFIG_CRYPTO_USER_API_AEAD is not set
|
||||
# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
|
||||
# end of Userspace interface
|
||||
|
||||
#
|
||||
@@ -12060,7 +12046,6 @@ CONFIG_ASYNC_RAID6_TEST=m
|
||||
# CONFIG_TEST_KEXEC_HANDOVER is not set
|
||||
CONFIG_ARCH_USE_MEMTEST=y
|
||||
CONFIG_MEMTEST=y
|
||||
# CONFIG_HYPERV_TESTING is not set
|
||||
# end of Kernel Testing and Coverage
|
||||
|
||||
#
|
||||
|
||||
@@ -1,16 +1,10 @@
|
||||
CONFIG_CC_IS_GCC=y
|
||||
CONFIG_GCC_VERSION=160101
|
||||
CONFIG_CLANG_VERSION=0
|
||||
CONFIG_AS_IS_GNU=y
|
||||
CONFIG_GCC_VERSION=160101
|
||||
CONFIG_RUSTC_VERSION=109601
|
||||
CONFIG_RUST_IS_AVAILABLE=y
|
||||
CONFIG_RUSTC_LLVM_VERSION=220108
|
||||
CONFIG_TOOLS_SUPPORT_RELR=y
|
||||
|
||||
CONFIG_RUST=y
|
||||
CONFIG_RUST_OVERFLOW_CHECKS=y
|
||||
CONFIG_RUSTC_VERSION_TEXT="rustc 1.96.1 (31fca3adb 2026-06-26) (Arch Linux rust 1:1.96.1-1)"
|
||||
|
||||
|
||||
# We need to disable CONFIG_WERROR because of stupid bcachefs rust stuff
|
||||
@@ -71,9 +65,9 @@ CONFIG_IO_URING=y
|
||||
CONFIG_IO_URING_ZCRX=y
|
||||
|
||||
CONFIG_BCACHEFS_FS=y
|
||||
CONFIG_BCACHEFS_DEBUG=n
|
||||
# CONFIG_BCACHEFS_DEBUG is not set
|
||||
|
||||
CONFIG_DEBUG_KERNEL=n
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
|
||||
# New proc acc file format
|
||||
#
|
||||
@@ -141,8 +135,8 @@ CONFIG_DEFAULT_HOSTNAME="kiralinux"
|
||||
|
||||
# Disabling BPF stuff
|
||||
#
|
||||
CONFIG_AF_KCM=n
|
||||
CONFIG_BPF_SYSCALL=n
|
||||
# CONFIG_AF_KCM is not set
|
||||
# CONFIG_BPF_SYSCALL is not set
|
||||
|
||||
|
||||
# Scheduler features
|
||||
@@ -154,12 +148,7 @@ CONFIG_UCLAMP_BUCKETS_COUNT=7
|
||||
|
||||
# Definetly no need for desktop not involved in kernel development
|
||||
#
|
||||
CONFIG_PROFILING=n
|
||||
|
||||
|
||||
# We generally want to remove any not common for desktop virtualization features
|
||||
#
|
||||
CONFIG_PCI_XEN=n
|
||||
# CONFIG_PROFILING is not set
|
||||
|
||||
|
||||
|
||||
@@ -192,7 +181,7 @@ CONFIG_BLK_MQ_STACKING=y
|
||||
# Users should prefer ZRAM or SWAP+ZRAM combination
|
||||
#
|
||||
CONFIG_SWAP=y
|
||||
CONFIG_ZSWAP=n
|
||||
# CONFIG_ZSWAP is not set
|
||||
CONFIG_ZSMALLOC=y
|
||||
|
||||
|
||||
@@ -337,12 +326,12 @@ CONFIG_PRINTK_TIME=y
|
||||
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4
|
||||
CONFIG_CONSOLE_LOGLEVEL_QUIET=1
|
||||
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
|
||||
CONFIG_BOOT_PRINTK_DELAY=n
|
||||
# CONFIG_BOOT_PRINTK_DELAY is not set
|
||||
CONFIG_SYMBOLIC_ERRNAME=y
|
||||
|
||||
CONFIG_X86_INTEL_TSX_MODE_OFF=n
|
||||
# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
|
||||
CONFIG_X86_INTEL_TSX_MODE_ON=y
|
||||
CONFIG_X86_INTEL_TSX_MODE_AUTO=n
|
||||
# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
|
||||
|
||||
|
||||
# UKI And Secure boot
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
|
||||
#
|
||||
# We generally want to remove any not common for desktop virtualization features
|
||||
#
|
||||
# CONFIG_PCI_XEN is not set
|
||||
|
||||
#
|
||||
# Microsoft Hyper-V guest support
|
||||
#
|
||||
# CONFIG_HYPERV is not set
|
||||
|
||||
Reference in New Issue
Block a user