From: Michael Tremer Date: Wed, 14 Dec 2022 11:29:43 +0000 (+0000) Subject: kernel: Disable option to execute 32 bit binaries X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3371197269ce3df78bd84d0da65afc3c61ed27d;p=ipfire-3.x.git kernel: Disable option to execute 32 bit binaries Since we are a 64 bit only distribution, there is no need to compile in any support for 32 bit binaries. Signed-off-by: Michael Tremer --- diff --git a/kernel/config-aarch64-generic b/kernel/config-aarch64-generic index b84602549..b080a0075 100644 --- a/kernel/config-aarch64-generic +++ b/kernel/config-aarch64-generic @@ -91,11 +91,8 @@ CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y -CONFIG_ARM64_ERRATUM_1742098=y -CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y -CONFIG_ARM64_ERRATUM_1418040=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1319367=y @@ -149,11 +146,7 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_ARM64_SW_TTBR0_PAN=y CONFIG_ARM64_TAGGED_ADDR_ABI=y -CONFIG_KUSER_HELPERS=y -CONFIG_ARMV8_DEPRECATED=y -CONFIG_SWP_EMULATION=y -CONFIG_CP15_BARRIER_EMULATION=y -CONFIG_SETEND_EMULATION=y +# CONFIG_COMPAT is not set # # ARMv8.1 architectural features diff --git a/kernel/config-generic b/kernel/config-generic index 42f50d6f5..feb444991 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -32,7 +32,6 @@ CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -CONFIG_SYSVIPC_COMPAT=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_WATCH_QUEUE is not set @@ -212,10 +211,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_LD_ORPHAN_WARN=y CONFIG_SYSCTL=y -CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_EXPERT=y -CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y @@ -402,7 +399,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y # # Binary Emulations # -CONFIG_COMPAT=y # end of Binary Emulations CONFIG_HAVE_KVM=y @@ -458,7 +454,6 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y -CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y @@ -482,11 +477,7 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y -CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y @@ -592,7 +583,6 @@ CONFIG_EFI_PARTITION=y # CONFIG_CMDLINE_PARTITION is not set # end of Partition Types -CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y @@ -629,7 +619,6 @@ CONFIG_FREEZER=y # Executable file formats # CONFIG_BINFMT_ELF=y -CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y @@ -732,7 +721,6 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y # end of Memory Management options CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y CONFIG_NET_REDIRECT=y diff --git a/kernel/config-x86_64-generic b/kernel/config-x86_64-generic index dc536f2b8..97e1ab857 100644 --- a/kernel/config-x86_64-generic +++ b/kernel/config-x86_64-generic @@ -187,7 +187,6 @@ CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -# CONFIG_COMPAT_VDSO is not set # CONFIG_LEGACY_VSYSCALL_XONLY is not set CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_CMDLINE_BOOL is not set @@ -291,13 +290,10 @@ CONFIG_AMD_NB=y # # Binary Emulations # -CONFIG_IA32_EMULATION=y +# CONFIG_IA32_EMULATION is not set # CONFIG_X86_X32_ABI is not set -CONFIG_COMPAT_32=y -CONFIG_COMPAT_FOR_U64_ALIGNMENT=y # end of Binary Emulations CONFIG_KVM_ASYNC_PF=y -CONFIG_KVM_COMPAT=y CONFIG_KVM=m CONFIG_KVM_WERROR=y CONFIG_KVM_INTEL=m @@ -319,7 +315,6 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_MMU_GATHER_MERGE_VMAS=y -CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_MMAP_RND_BITS=32 @@ -356,17 +351,11 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y CONFIG_MAPPING_DIRTY_HELPERS=y -# -# Networking options -# -# CONFIG_XFRM_USER_COMPAT is not set - # # Classification # CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_HYPERV_VSOCKETS=m -# end of Networking options # # Network testing diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 7c9a54559..c3bc298c7 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 6.0.6 -release = 0.24 +release = 0.25 thisapp = linux-%{version} maintainer = Arne Fitzenreiter