main/linux-lts: enable virtio-mem for virt kernels

They were likely disabled unintentionally.

fixes https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/61693

DEBUG_FS appears to be enabled by defconfig.

(cherry picked from commit 0968f640b76a3cc5463fd445365300cba6d1916d)
This commit is contained in:
Natanael Copa 2024-03-06 13:40:30 +01:00
parent 375294811f
commit 9cb3c1b4f4
6 changed files with 12 additions and 11 deletions

View File

@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
pkgrel=0
pkgrel=1
pkgdesc="Linux lts kernel"
url="https://www.kernel.org"
depends="initramfs-generator"
@ -349,10 +349,10 @@ sha512sums="
d792b0b606374ff6a09302fdd0c8d8fda3944c278018cd1162510613d1f306714654890875a4eda3da2fc2afe180e7e20cf825bcb942157efeb40a0fe0cfd4c2 lts.x86_64.config
bb5d193f9ea543603ab0854c6fc86a7c4fb5e1893c29cf175bdd8accd180fe13ad6a0566272a464b85b6e7a0a91ff60d3a9c22889aff0314a83987bd12ed34ad lts.ppc64le.config
e8a90a018aa6d83ba969cd369a4bad4316bf1d06113befe231fedafb36a5e765a34a98eb6dacd118b85a2051961bacecdeacb9eb7a10d821b9ce24d86d834bff lts.s390x.config
90068a7baead8e28ae04f9c69dc4cabe8b9819fec97e7d921709dc138c3fc5965ebd8f2fcef5b23ca1f12e566562f4a367804a5fdd19c678b6d945d6d3cef8ac virt.aarch64.config
4b98a383c0650acba705e6d308c61f9eb56a79034ea8c46f7512a50fe312cb5a1c7690df62ffaa1cc89f233beac0f3206f35fde54df88e1c83f70c0cbcfea937 virt.armv7.config
a6d1be15ef851f576a13708631fec3728cfaa42ecdcab6849163ae5ea0b3ace5c8632d72aa4652c762d8799d57edfd2f559f479224b1e19ec96a777124a90cba virt.ppc64le.config
dbd4fc6ccbdfe7b14b49c2e9a7e9c176df742891a9b9c1e62a624e48647d9c787b620d0f1f863e06088933e30a4b4f722c649c211249f41a1bf3890e9d30d4d6 virt.x86.config
8c2e37e2585798e800da741ddac7130feb362637803b7c9c628a1731d79ec8c0afc3986b7a51620a67be9412b943e8858bcf8f46aef3e0d39cefc9b93f28bb09 virt.x86_64.config
58a016e15abdfafb35a3417c9642b453556fee742487355828696926a6c4fcf9b096bd778f94a9d6b0049b964e1f305a291fa2b63758625c1baeb0802bbb096f virt.aarch64.config
05e5325cf720ff58de6a6e9e1c81d53ca4fa80911468c53a991ea9b9c0f615a2100527a3d7d0bea94fbffb82340fbea70e377e9ac86f3e551f5131cca3fbd834 virt.armv7.config
2814c6dda4d2161a32d4625d8f9a989f10486a927c39c6dee80be8a6eb1555e59bd1a3fba8f2d6e1a5ef7dd90f63f75e49bb1973cbb0f0b7f63a227d98b1da6d virt.ppc64le.config
1d8848c506029bc16683a3f2f83a6416a600a17874f1538fee3a4f6c3958c8fd6175a98f894be4bceb4dadf6791f1453222e39bbcbdaa108638aa097c420bef7 virt.x86.config
db5969440da77db88271de1584c8fa294e667768cae3bab6191571976c4c4a5915a0217c56fae051b88c27a1f05d87799f326e13b709aa4657851c37d8c7e2ea virt.x86_64.config
0eff5c2cc691260a7197cbc0e709e6b81a9174de13e4bc254e51c7a61fab73626c56bcb7c9cd4cba773d800a0847af4c8b4af6379339b23c44c1c24f89426240 patch-6.6.20.xz
"

View File

@ -77,6 +77,7 @@ CONFIG_ACPI_TINY_POWER_BUTTON=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_PCI_SLOT=y
CONFIG_ACPI_HOTPLUG_MEMORY=y
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_EINJ=m
@ -102,6 +103,9 @@ CONFIG_Z3FOLD=m
CONFIG_ZSMALLOC=y
CONFIG_SLAB_FREELIST_RANDOM=y
# CONFIG_COMPAT_BRK is not set
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_KSM=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_LRU_GEN=y
@ -794,6 +798,7 @@ CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_VDPA=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MEM=m
CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@ -1065,7 +1070,6 @@ CONFIG_DEBUG_INFO_DWARF5=y
CONFIG_DEBUG_INFO_BTF=y
CONFIG_FRAME_WARN=1280
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_KFENCE=y

View File

@ -1009,7 +1009,6 @@ CONFIG_DYNAMIC_DEBUG=y
CONFIG_DEBUG_INFO_DWARF5=y
CONFIG_FRAME_WARN=1280
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_SHIRQ=y

View File

@ -998,7 +998,6 @@ CONFIG_CONSOLE_LOGLEVEL_QUIET=3
CONFIG_DYNAMIC_DEBUG=y
CONFIG_FRAME_WARN=1280
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_STACKOVERFLOW=y

View File

@ -1036,7 +1036,6 @@ CONFIG_DYNAMIC_DEBUG=y
CONFIG_DEBUG_INFO_DWARF5=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_DEBUG_RODATA_TEST=y
CONFIG_DEBUG_STACKOVERFLOW=y

View File

@ -805,6 +805,7 @@ CONFIG_EFI_SECRET=m
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_VDPA=m
CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_MEM=m
CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=y
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@ -1079,7 +1080,6 @@ CONFIG_DEBUG_INFO_DWARF5=y
CONFIG_DEBUG_INFO_BTF=y
CONFIG_FRAME_WARN=1280
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
# CONFIG_SLUB_DEBUG is not set
CONFIG_DEBUG_RODATA_TEST=y
CONFIG_KFENCE=y