From be5f1d36a286c6e34c1941b7a71ac3fd53033deb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 18:03:39 -0800 Subject: [PATCH 01/15] eclass/coreos-kernel.eclass: Fix typo in comment --- .../src/third_party/coreos-overlay/eclass/coreos-kernel.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index 45bb8036e2..f722573bf5 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -214,7 +214,7 @@ coreos-kernel_src_configure() { # Use default for any options not explitly set in defconfig kmake olddefconfig - # For convinence, generate a minimal defconfig of the build + # For convenience, generate a minimal defconfig of the build kmake savedefconfig } From 7645b11972674c7b89856227e053fbb9431de4d0 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 18:26:25 -0800 Subject: [PATCH 02/15] sys-kernel/coreos-modules: Drop obsolete config options CONFIG_I7300_IDLE enables a driver that was dropped in 4.10. CONFIG_DEBUG_STRICT_USER_COPY_CHECKS was dropped in 4.8. CONFIG_ZRAM_LZ4_COMPRESS was obsoleted by CryptoAPI in 4.8. CONFIG_I40E_VXLAN is a driver option that was dropped in 4.8. --- .../sys-kernel/coreos-modules/files/amd64_defconfig-4.10 | 2 -- .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 -- 2 files changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 index b1865259d8..5b6f15407d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 @@ -49,7 +49,6 @@ CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set CONFIG_X86_AMD_FREQ_SENSITIVITY=m CONFIG_INTEL_IDLE=y -CONFIG_I7300_IDLE=m CONFIG_PCI_MMCONFIG=y CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_HOTPLUG_PCI_ACPI=y @@ -146,7 +145,6 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_STACK_TRACER=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index 5504ed15f3..c3a3be04e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -409,7 +409,6 @@ CONFIG_CONNECTOR=m CONFIG_MTD=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m -CONFIG_ZRAM_LZ4_COMPRESS=y CONFIG_BLK_CPQ_CISS_DA=m CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_NBD=m @@ -550,7 +549,6 @@ CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_IXGBEVF=m CONFIG_I40E=m -CONFIG_I40E_VXLAN=y CONFIG_I40EVF=m CONFIG_JME=m CONFIG_SKGE=m From 52c710f4c6484fb0b245777469452ffbf6e260ba Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 18:37:11 -0800 Subject: [PATCH 03/15] sys-kernel/coreos-modules: Enable Infiniband RDMA verbs library CONFIG_INFINIBAND_QIB gained a CONFIG_INFINIBAND_RDMAVT dependency in 4.6. The QIB driver appears actively maintained, and we enable a number of other Infiniband drivers. --- .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index c3a3be04e8..14a25ad836 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -691,6 +691,7 @@ CONFIG_MMC_SDHCI_PCI=m # CONFIG_MMC_RICOH_MMC is not set CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_RDMAVT=m CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_CXGB3=m From 01d22664dceab6d94efd65bdfb1b5c68a27ffdb1 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 19:24:14 -0800 Subject: [PATCH 04/15] sys-kernel/coreos-modules: Enable netfilter IP socket lookup support In 4.10 this code was factored out of CONFIG_NETFILTER_XT_MATCH_SOCKET, which now depends on it. --- .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index 14a25ad836..6294823bd6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -163,6 +163,8 @@ CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_SOCKET_IPV6=m CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m From e54f7938bc260087490568592e0bcd09e15362b9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:02:54 -0800 Subject: [PATCH 05/15] sys-kernel/coreos-modules: Drop some 802.11 options on ARM In practice they're disabled, and they likely don't belong there in the first place. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index 1481def5a7..fd1521eba9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -40,9 +40,6 @@ CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_BRIDGE=y CONFIG_DNS_RESOLVER=y -CONFIG_CFG80211=m -# CONFIG_CFG80211_DEFAULT_PS is not set -CONFIG_MAC80211=m CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DMA_CMA=y CONFIG_BLK_DEV_LOOP=y @@ -74,7 +71,6 @@ CONFIG_SMSC911X=y CONFIG_MDIO_BITBANG=m CONFIG_MDIO_GPIO=m CONFIG_MDIO_OCTEON=y -CONFIG_RTL8192CE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 From 888a1c0694460769d2cabe9203117186dbbb11d1 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:19:37 -0800 Subject: [PATCH 06/15] sys-kernel/coreos-modules: Move some options to amd64 They are explicitly marked x86-only in 4.10. --- .../sys-kernel/coreos-modules/files/amd64_defconfig-4.10 | 2 ++ .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 index 5b6f15407d..7bc837a78f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 @@ -160,3 +160,5 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_ENA_ETHERNET=m +CONFIG_FCOE_FNIC=m +CONFIG_ISCSI_IBFT_FIND=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index 6294823bd6..af3179e165 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -433,7 +433,6 @@ CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_SAS_ATA=y CONFIG_ISCSI_TCP=m CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_IBFT_FIND=y CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_HPSA=m CONFIG_SCSI_3W_9XXX=m @@ -453,7 +452,6 @@ CONFIG_XEN_SCSI_FRONTEND=m CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_QLA_FC=m CONFIG_SCSI_LPFC=m From ca495e52f64bc260e33c4f38fc0825c96f8c2432 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:20:52 -0800 Subject: [PATCH 07/15] sys-kernel/coreos-modules: Move some more options to amd64 They require architecture features not available on arm64 as of 4.10. --- .../sys-kernel/coreos-modules/files/amd64_defconfig-4.10 | 2 ++ .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 index 7bc837a78f..256c42c1f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.10 @@ -160,5 +160,7 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_ENA_ETHERNET=m +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_FCOE_FNIC=m CONFIG_ISCSI_IBFT_FIND=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index af3179e165..34f3486f85 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -37,8 +37,6 @@ CONFIG_BPF_SYSCALL=y CONFIG_PROFILING=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y CONFIG_KRETPROBES=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_MODULES=y From e96ae91ea2670c9ad5eddec18523cfd21ebcc219 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:27:20 -0800 Subject: [PATCH 08/15] sys-kernel/coreos-modules: Drop some Ethernet drivers on ARM They depend on CONFIG_NET_VENDOR_SMSC, which has never been enabled. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index fd1521eba9..fdad8955a8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -66,8 +66,6 @@ CONFIG_NET_XGENE=y CONFIG_THUNDER_NIC_PF=y CONFIG_THUNDER_NIC_VF=y CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y CONFIG_MDIO_BITBANG=m CONFIG_MDIO_GPIO=m CONFIG_MDIO_OCTEON=y From e6db763aa120d9a74364773686c958f7a0014d01 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:33:40 -0800 Subject: [PATCH 09/15] sys-kernel/coreos-modules: Drop redundant option setting It's already set in commonconfig. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index fdad8955a8..30503e93f9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -39,7 +39,6 @@ CONFIG_NF_CONNTRACK=y # CONFIG_NETFILTER_XT_MATCH_SCTP is not set CONFIG_NF_CONNTRACK_IPV4=y CONFIG_BRIDGE=y -CONFIG_DNS_RESOLVER=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DMA_CMA=y CONFIG_BLK_DEV_LOOP=y From 7892989f7d54092e4aed7563f4c3cfdf96755614 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:35:46 -0800 Subject: [PATCH 10/15] sys-kernel/coreos-modules: Fix warning about CONFIG_NF_CT_PROTO_UDPLITE It's no longer a tristate in 4.10. --- .../sys-kernel/coreos-modules/files/commonconfig-4.10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 index 34f3486f85..2d150b6360 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.10 @@ -148,7 +148,7 @@ CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m From 377a9af4e0a34b908af5ea57d5c2c628b4996188 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 20:38:20 -0800 Subject: [PATCH 11/15] sys-kernel/coreos-modules: Fix build warning about CONFIG_HWMON It's overridden to "m" in commonconfig. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index 30503e93f9..39f7e927dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -91,7 +91,6 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -# CONFIG_HWMON is not set CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB_ARMCLCD=y From b012827043a14f02f181f02ad80bad4d7172fa78 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 22:03:46 -0800 Subject: [PATCH 12/15] sys-kernel/coreos-modules: Fix CONFIG_TCG_TIS_ST33ZP24 on ARM64 It doesn't do anything without the I2C or SPI submodules enabled. It's not clear what was meant, so enable both. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index 39f7e927dc..72c62aa9b1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -82,6 +82,8 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_ST33ZP24=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m +CONFIG_TCG_TIS_ST33ZP24_SPI=m CONFIG_SPI=y CONFIG_SPI_PL022=y CONFIG_SPI_QUP=y From 7c9b0460601d2e333b5559bec0091dc36f512c93 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 22:10:40 -0800 Subject: [PATCH 13/15] sys-kernel/coreos-modules: Unmask CONFIG_FTRACE on arm64 It doesn't appear to have been deliberately masked. Fixes CONFIG_BPF_EVENTS and CONFIG_KPROBE_EVENT values set from commonconfig. --- .../sys-kernel/coreos-modules/files/arm64_defconfig-4.10 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 index 72c62aa9b1..f89aaf21aa 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.10 @@ -129,7 +129,6 @@ CONFIG_KVM=y CONFIG_DEBUG_FS=y CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set -# CONFIG_FTRACE is not set CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y From 690c369cbe16dd01c3b74fcaefc3eac2435aa5d2 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 22:19:50 -0800 Subject: [PATCH 14/15] eclass/coreos-kernel.eclass: Verify enablement of kconfig options If any kconfig options are set to "y" or "m" in the defconfig or commonconfig, but are set to "n" after "make olddefconfig" runs, fail the build. --- .../coreos-overlay/eclass/coreos-kernel.eclass | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index f722573bf5..a6d5542081 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -214,6 +214,23 @@ coreos-kernel_src_configure() { # Use default for any options not explitly set in defconfig kmake olddefconfig + # Verify that olddefconfig has not converted any y or m options to n + # (implying a new, disabled dependency). Allow options to be converted + # from m to y. + # + # generate regexes from enabled boolean/tristate options | + # filter them out of the defconfig | + # filter for boolean/tristate options, and format | + # sort (why not) + local missing=$( \ + gawk -F = '/=[ym]$/ {print "^" $1 "="}' "${S}/build/.config" | \ + grep -vf - "${S}/build/.config.old" | \ + gawk -F = '/=[ym]$/ {print " " $1}' | \ + sort) + if [[ -n "${missing}" ]]; then + die "Requested options not enabled in build:\n${missing}" + fi + # For convenience, generate a minimal defconfig of the build kmake savedefconfig } From 485d2aab0058f2a210d3bdad5a97694699ad121c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 9 Mar 2017 22:29:35 -0800 Subject: [PATCH 15/15] coreos-{modules,kernel}: Bump for config changes --- ...eos-kernel-4.10.1-r1.ebuild => coreos-kernel-4.10.1-r2.ebuild} | 0 ...s-modules-4.10.1-r1.ebuild => coreos-modules-4.10.1-r2.ebuild} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.10.1-r1.ebuild => coreos-kernel-4.10.1-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.10.1-r1.ebuild => coreos-modules-4.10.1-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.10.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.10.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.10.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.10.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.10.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.10.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.10.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.10.1-r2.ebuild