diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-10-01 18:24:28 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-10-01 20:43:07 +0200 |
| commit | 4f5a9a7b09f7b5cf330d47884c0501d5883a53d7 (patch) | |
| tree | 525e772ce08c261621a3418793025bf4eda7cfcc /scripts/package-build/linux-kernel | |
| parent | c6d478cce58f26be1a25fc5c09f31a7c23b9845b (diff) | |
| download | vyos-build-4f5a9a7b09f7b5cf330d47884c0501d5883a53d7.tar.gz vyos-build-4f5a9a7b09f7b5cf330d47884c0501d5883a53d7.zip | |
Kernel: T9014: keep architecture specific options out of shared snippets
The config/*.config snippets are merged on every architecture, so an option
that only exists on one of them is reported as a mismatch on the others:
Value requested for CONFIG_NETLABEL not in final .config
Requested value: # CONFIG_NETLABEL is not set
Actual value:
Three options are only available on amd64 and were sitting in the shared
snippets. Move them to the amd64 base config, each next to the symbol that
gates it:
* XFRM_USER_COMPAT needs COMPAT_FOR_U64_ALIGNMENT
* HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON needs
ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
* NETLABEL depends on SECURITY, which arm64 does not enable
Diffstat (limited to 'scripts/package-build/linux-kernel')
3 files changed, 3 insertions, 5 deletions
diff --git a/scripts/package-build/linux-kernel/config/00-filesystems.config b/scripts/package-build/linux-kernel/config/00-filesystems.config index bd3ddca5..edf4f0f2 100644 --- a/scripts/package-build/linux-kernel/config/00-filesystems.config +++ b/scripts/package-build/linux-kernel/config/00-filesystems.config @@ -82,7 +82,6 @@ CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_CHILDREN=y -CONFIG_PROC_PID_ARCH_STATUS=y CONFIG_KERNFS=y CONFIG_SYSFS=y CONFIG_TMPFS=y @@ -91,9 +90,7 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set # CONFIG_TMPFS_QUOTA is not set CONFIG_HUGETLBFS=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_HUGETLB_PAGE=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=m diff --git a/scripts/package-build/linux-kernel/config/10-networking.config b/scripts/package-build/linux-kernel/config/10-networking.config index 25ae581c..1319d421 100644 --- a/scripts/package-build/linux-kernel/config/10-networking.config +++ b/scripts/package-build/linux-kernel/config/10-networking.config @@ -13,7 +13,6 @@ CONFIG_XFRM=y CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_ALGO=m CONFIG_XFRM_USER=m -# CONFIG_XFRM_USER_COMPAT is not set CONFIG_XFRM_INTERFACE=m CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y @@ -115,7 +114,6 @@ CONFIG_IPV6_SEG6_HMAC=y CONFIG_IPV6_SEG6_BPF=y # CONFIG_IPV6_RPL_LWTUNNEL is not set # CONFIG_IPV6_IOAM6_LWTUNNEL is not set -# CONFIG_NETLABEL is not set CONFIG_MPTCP=y CONFIG_INET_MPTCP_DIAG=m CONFIG_MPTCP_IPV6=y diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig index 778db7ce..f30f87d7 100644 --- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig +++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig @@ -879,6 +879,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y +# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_MEMORY_ISOLATION=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y @@ -953,6 +954,7 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y # end of Memory Management options CONFIG_NET=y +# CONFIG_XFRM_USER_COMPAT is not set CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y @@ -4384,6 +4386,7 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y # CONFIG_PROC_MEM_FORCE_PTRACE is not set # CONFIG_PROC_MEM_NO_FORCE is not set CONFIG_SECURITY=y +# CONFIG_NETLABEL is not set CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_INFINIBAND is not set |