mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-24 13:36:31 +00:00
Clean up inconsistencies in kernel configs
Clean up all kernel configs and fragments from non-existing kernel options, invalid choice values and choices that trigger warnings during kernel package configuration. Here's an example of warnings triggered for Yellow: .config:8531:warning: override: MODULE_COMPRESS_NONE changes choice state .config:8536:warning: override: ZSWAP_COMPRESSOR_DEFAULT_LZ4 changes choice state .config:8537:warning: override: ZSWAP_ZPOOL_DEFAULT_ZSMALLOC changes choice state .config:8543:warning: override: CPU_FREQ_DEFAULT_GOV_ONDEMAND changes choice state .config:8717:warning: override: reassigning to symbol CGROUP_HUGETLB .config:8767:warning: symbol value 'm' invalid for XFRM .config:8852:warning: symbol value 'm' invalid for MEDIA_CONTROLLER_DVB .config:8972:warning: symbol value 'm' invalid for SND_HDA_I915 There were also some options that are set in our or default configs but end up patched by `KCONFIG_(DIS|EN)ABLE_OPT` in package makefiles, these options are now explicitly set in our fragments too. For example this was toggled for `generic_aarch64`: CONFIG_DEFAULT_SECURITY_APPARMOR n -> y CONFIG_DEFAULT_SECURITY_DAC y -> n CONFIG_GCC_PLUGINS y -> n The only goal of this commit is to make sure no warnings appear anymore and the resulting kernel configs remain unchanged. This will allow us to create tools for sanity checks of our kernel config overrides. There is one single change in `ova` config resulting from previously invalid `m` option for a bool value: -# CONFIG_9P_FS_POSIX_ACL is not set +CONFIG_9P_FS_POSIX_ACL=y
This commit is contained in:
parent
754bec30fd
commit
0f2b7c49f2
@ -1,5 +1,7 @@
|
||||
CONFIG_EFI_STUB=y
|
||||
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
|
||||
|
||||
CONFIG_VIRTIO=y
|
||||
CONFIG_VIRTIO_PCI=y
|
||||
CONFIG_VIRTIO_NET=y
|
||||
|
@ -25,11 +25,11 @@ CONFIG_HAVE_KERNEL_LZMA=y
|
||||
CONFIG_HAVE_KERNEL_XZ=y
|
||||
CONFIG_HAVE_KERNEL_LZO=y
|
||||
CONFIG_HAVE_KERNEL_LZ4=y
|
||||
CONFIG_KERNEL_GZIP=y
|
||||
# CONFIG_KERNEL_GZIP is not set
|
||||
# CONFIG_KERNEL_LZMA is not set
|
||||
# CONFIG_KERNEL_XZ is not set
|
||||
# CONFIG_KERNEL_LZO is not set
|
||||
# CONFIG_KERNEL_LZ4 is not set
|
||||
CONFIG_KERNEL_LZ4=y
|
||||
CONFIG_DEFAULT_HOSTNAME="localhost"
|
||||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
@ -631,7 +631,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
# CONFIG_MODVERSIONS is not set
|
||||
# CONFIG_MODULE_SRCVERSION_ALL is not set
|
||||
# CONFIG_MODULE_SIG is not set
|
||||
# CONFIG_MODULE_COMPRESS is not set
|
||||
# CONFIG_TRIM_UNUSED_KSYMS is not set
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_BLOCK=y
|
||||
@ -893,7 +892,7 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y
|
||||
CONFIG_NF_CONNTRACK_TIMESTAMP=y
|
||||
CONFIG_NF_CONNTRACK_LABELS=y
|
||||
CONFIG_NF_CT_PROTO_DCCP=y
|
||||
CONFIG_NF_CT_PROTO_GRE=m
|
||||
CONFIG_NF_CT_PROTO_GRE=y
|
||||
CONFIG_NF_CT_PROTO_SCTP=y
|
||||
CONFIG_NF_CT_PROTO_UDPLITE=y
|
||||
CONFIG_NF_CONNTRACK_AMANDA=m
|
||||
@ -1540,7 +1539,7 @@ CONFIG_BT_MRVL_SDIO=y
|
||||
CONFIG_BT_MTKUART=m
|
||||
# CONFIG_AF_RXRPC is not set
|
||||
# CONFIG_AF_KCM is not set
|
||||
CONFIG_STREAM_PARSER=m
|
||||
CONFIG_STREAM_PARSER=y
|
||||
CONFIG_FIB_RULES=y
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
@ -2894,7 +2893,7 @@ CONFIG_SENSORS_W83L785TS=m
|
||||
CONFIG_SENSORS_W83L786NG=m
|
||||
CONFIG_SENSORS_W83627HF=m
|
||||
CONFIG_SENSORS_W83627EHF=m
|
||||
CONFIG_THERMAL=m
|
||||
CONFIG_THERMAL=y
|
||||
# CONFIG_THERMAL_STATISTICS is not set
|
||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
@ -5914,7 +5913,6 @@ CONFIG_INTEGRITY=y
|
||||
CONFIG_INTEGRITY_AUDIT=y
|
||||
# CONFIG_IMA is not set
|
||||
# CONFIG_EVM is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
CONFIG_DEFAULT_SECURITY=""
|
||||
CONFIG_XOR_BLOCKS=y
|
||||
CONFIG_ASYNC_CORE=y
|
||||
|
@ -541,10 +541,10 @@ CONFIG_CPU_FREQ=y
|
||||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
|
||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
@ -787,7 +787,6 @@ CONFIG_MODULE_UNLOAD=y
|
||||
# CONFIG_MODVERSIONS is not set
|
||||
# CONFIG_MODULE_SRCVERSION_ALL is not set
|
||||
# CONFIG_MODULE_SIG is not set
|
||||
# CONFIG_MODULE_COMPRESS is not set
|
||||
# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
|
||||
# CONFIG_UNUSED_SYMBOLS is not set
|
||||
# CONFIG_TRIM_UNUSED_KSYMS is not set
|
||||
@ -7034,7 +7033,7 @@ CONFIG_CRYPTO_HASH_INFO=y
|
||||
#
|
||||
CONFIG_CRYPTO_LIB_AES=y
|
||||
CONFIG_CRYPTO_LIB_ARC4=m
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
|
||||
CONFIG_CRYPTO_LIB_BLAKE2S=m
|
||||
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
|
||||
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
|
||||
|
@ -95,7 +95,7 @@ CONFIG_JUMP_LABEL=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODULE_COMPRESS_XZ=y
|
||||
CONFIG_MODULE_COMPRESS_NONE=y
|
||||
CONFIG_BLK_DEV_ZONED=y
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
CONFIG_BLK_DEV_THROTTLING_LOW=y
|
||||
@ -114,8 +114,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_BINFMT_MISC=m
|
||||
CONFIG_ZSWAP=y
|
||||
CONFIG_ZSWAP_DEFAULT_ON=y
|
||||
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
|
||||
CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
|
||||
CONFIG_ZBUD=y
|
||||
CONFIG_ZSMALLOC=y
|
||||
CONFIG_SLAB_FREELIST_RANDOM=y
|
||||
|
@ -1,3 +1,4 @@
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
|
||||
CONFIG_THERMAL_GOV_BANG_BANG=y
|
||||
|
@ -1,3 +1,4 @@
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
|
||||
CONFIG_THERMAL_GOV_BANG_BANG=y
|
||||
|
@ -1,3 +1,4 @@
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
|
||||
CONFIG_THERMAL_GOV_BANG_BANG=y
|
||||
|
@ -95,7 +95,7 @@ CONFIG_JUMP_LABEL=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODULE_COMPRESS_XZ=y
|
||||
CONFIG_MODULE_COMPRESS_NONE=y
|
||||
CONFIG_BLK_DEV_ZONED=y
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
CONFIG_BLK_DEV_THROTTLING_LOW=y
|
||||
@ -114,8 +114,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
CONFIG_BINFMT_MISC=m
|
||||
CONFIG_ZSWAP=y
|
||||
CONFIG_ZSWAP_DEFAULT_ON=y
|
||||
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
|
||||
CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y
|
||||
CONFIG_ZBUD=y
|
||||
CONFIG_ZSMALLOC=y
|
||||
CONFIG_SLAB_FREELIST_RANDOM=y
|
||||
|
@ -4,6 +4,10 @@ CONFIG_CPU_IDLE=y
|
||||
CONFIG_CPU_IDLE_GOV_MENU=y
|
||||
CONFIG_INTEL_IDLE=y
|
||||
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
|
||||
|
||||
CONFIG_SCSI_LOWLEVEL=y
|
||||
CONFIG_SCSI_HPSA=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
|
@ -1,5 +1,9 @@
|
||||
CONFIG_EFI_STUB=y
|
||||
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
|
||||
|
||||
CONFIG_HOTPLUG_CPU=y
|
||||
CONFIG_MEMORY_HOTPLUG=y
|
||||
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
|
||||
@ -7,7 +11,6 @@ CONFIG_MEMORY_HOTREMOVE=y
|
||||
CONFIG_ACPI_HOTPLUG_MEMORY=y
|
||||
|
||||
CONFIG_VMXNET3=y
|
||||
CONFIG_VMWARE_PVSCSI=y
|
||||
CONFIG_VMWARE_VMCI_VSOCKETS=y
|
||||
CONFIG_VMWARE_VMCI=y
|
||||
CONFIG_VMWARE_BALLOON=y
|
||||
@ -17,7 +20,7 @@ CONFIG_VMWARE_PVSCSI=y
|
||||
CONFIG_NET_9P=m
|
||||
CONFIG_NET_9P_VIRTIO=m
|
||||
CONFIG_9P_FS=m
|
||||
CONFIG_9P_FS_POSIX_ACL=m
|
||||
CONFIG_9P_FS_POSIX_ACL=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_VSOCKETS=m
|
||||
CONFIG_VIRTIO_VSOCKETS_COMMON=m
|
||||
|
@ -1,6 +1,8 @@
|
||||
# CONFIG_AUTOFS4_FS is not set
|
||||
# CONFIG_AUTOFS_FS is not set
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
|
||||
# CONFIG_PGTABLE_MAPPING is not set
|
||||
# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set
|
||||
# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set
|
||||
|
||||
CONFIG_LOCALVERSION="-haos-raspi"
|
||||
|
||||
CONFIG_NVME_CORE=y
|
||||
|
@ -67,7 +67,7 @@ CONFIG_RT2800USB_UNKNOWN=y
|
||||
# Multimedia core support
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
CONFIG_MEDIA_CONTROLLER_DVB=m
|
||||
CONFIG_MEDIA_CONTROLLER_DVB=y
|
||||
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
||||
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
|
||||
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
|
||||
@ -187,7 +187,7 @@ CONFIG_SND_HDA=y
|
||||
CONFIG_SND_HDA_CORE=y
|
||||
CONFIG_SND_HDA_GENERIC=y
|
||||
CONFIG_SND_HDA_INTEL=m
|
||||
CONFIG_SND_HDA_I915=m
|
||||
CONFIG_SND_HDA_I915=y
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=m
|
||||
CONFIG_SND_HDA_CODEC_ANALOG=m
|
||||
CONFIG_SND_HDA_CODEC_VIA=m
|
||||
|
@ -6,6 +6,7 @@ CONFIG_NET_SCHED=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
|
||||
CONFIG_CGROUPS=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_HUGETLB_PAGE=y
|
||||
CONFIG_BLK_CGROUP=y
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
@ -16,7 +17,6 @@ CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_CPUACCT=y
|
||||
CONFIG_CGROUP_PERF=y
|
||||
CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_NET_CLS_CGROUP=y
|
||||
CONFIG_CGROUP_NET_PRIO=y
|
||||
CONFIG_CGROUP_BPF=y
|
||||
@ -66,7 +66,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
||||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||
CONFIG_BRIDGE=y
|
||||
CONFIG_BRIDGE_NETFILTER=y
|
||||
CONFIG_XFRM=m
|
||||
CONFIG_XFRM=y
|
||||
CONFIG_XFRM_USER=m
|
||||
CONFIG_XFRM_ALGO=m
|
||||
CONFIG_NET_L3_MASTER_DEV=y
|
||||
|
@ -1,15 +1,23 @@
|
||||
CONFIG_LOCALVERSION="-haos"
|
||||
CONFIG_KERNEL_LZ4=y
|
||||
# CONFIG_KERNEL_GZIP is not set
|
||||
|
||||
# GCC plugins are disabled by linux.mk, disable them here to reduce
|
||||
# linux-diff-config noise
|
||||
CONFIG_GCC_PLUGINS=n
|
||||
|
||||
CONFIG_CMDLINE=""
|
||||
CONFIG_PANIC_TIMEOUT=5
|
||||
|
||||
CONFIG_PREEMPT=y
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
# CONFIG_DEBUG_PREEMPT is not set
|
||||
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
|
||||
CONFIG_MODULE_COMPRESS_NONE=y
|
||||
# CONFIG_MODULE_COMPRESS_XZ is not set
|
||||
|
||||
CONFIG_ZRAM=y
|
||||
CONFIG_ZSWAP=y
|
||||
@ -42,6 +50,9 @@ CONFIG_SECCOMP=y
|
||||
CONFIG_SECCOMP_FILTER=y
|
||||
|
||||
CONFIG_AUDIT=y
|
||||
CONFIG_DEFAULT_SECURITY_APPARMOR=y
|
||||
# CONFIG_DEFAULT_SECURITY_DAC is not set
|
||||
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
|
||||
CONFIG_SECURITY=y
|
||||
CONFIG_SECURITY_APPARMOR=y
|
||||
# CONFIG_SECURITY_SELINUX is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user