From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Michael Olbrich Date: Fri, 24 Apr 2020 13:18:57 +0200 Message-Id: <20200424111857.16749-1-m.olbrich@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH] MIPS: kernel: keep the config files stable List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Oleksij Rempel , Michael Olbrich This is basically the same as the ptxdist upstream commit c065184961ab1973c304ee31347205569b4f7536 ("kernel: add workaround to keep kernelconfigs stable") With linux-4.19 and gcc-8.x oldconfig will prompt for extra options that are not available with e.g. gcc-7.x. This causes problems when a BSP is built with different host compilers. Add a workaround to optionally disable these extra options by forcing the compiler check to fail. Signed-off-by: Michael Olbrich --- configs/platform-mips/rules/kernel-ar9331.make | 4 ++++ configs/platform-mips/rules/kernel-malta.make | 4 ++++ configs/platform-mips/rules/kernel.make | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index fd594ca4ae2b..bb7ddbc25c94 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -41,6 +41,10 @@ KERNEL_AR9331_CONF_OPT := \ O=$(KERNEL_AR9331_BUILD_DIR) \ $(call kernel-opts, KERNEL_AR9331) +# no gcc plugins; avoid config changes depending on the host compiler +KERNEL_AR9331_CONF_OPT += \ + HOSTCXX=false + KERNEL_AR9331_IMAGES := vmlinuz KERNEL_AR9331_IMAGES := $(addprefix $(KERNEL_AR9331_BUILD_DIR)/,$(KERNEL_AR9331_IMAGES)) diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make index e43311b2cfd3..0450e04ce690 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -41,6 +41,10 @@ KERNEL_MALTA_CONF_OPT := \ O=$(KERNEL_MALTA_BUILD_DIR) \ $(call kernel-opts, KERNEL_MALTA) +# no gcc plugins; avoid config changes depending on the host compiler +KERNEL_MALTA_CONF_OPT += \ + HOSTCXX=false + KERNEL_MALTA_IMAGES := vmlinuz KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make index 26187a83a7a4..a9eb0f207a80 100644 --- a/configs/platform-mips/rules/kernel.make +++ b/configs/platform-mips/rules/kernel.make @@ -41,6 +41,10 @@ KERNEL_CONF_OPT := \ O=$(KERNEL_BUILD_DIR) \ $(call kernel-opts, KERNEL) +# no gcc plugins; avoid config changes depending on the host compiler +KERNEL_CONF_OPT += \ + HOSTCXX=false + ifdef PTXCONF_KERNEL $(KERNEL_CONFIG): @echo -- 2.20.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de