From 6bb4603ed6fb93982fb0c0e53b3338ab5884f85a Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 18 Oct 2023 19:33:46 +0200 Subject: [PATCH] util/kconfig: add savedefconfig patch to quilt Adds commit 48ad5c23680c util/kconfig: chmod +w before savedefconfig to quilt patch series. Change-Id: I381dce2fee995227efc60169fd90ab505c99b74b Signed-off-by: Richard Marko Reviewed-on: https://review.coreboot.org/c/coreboot/+/78440 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- ...kconfig-chmod-w-before-savedefconfig.patch | 30 +++++++++++++++++++ util/kconfig/patches/series | 1 + 2 files changed, 31 insertions(+) create mode 100644 util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch diff --git a/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch b/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch new file mode 100644 index 0000000000..2b96723693 --- /dev/null +++ b/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch @@ -0,0 +1,30 @@ +From 48ad5c23680c81614663e09c6586ebeb26bf8c18 Mon Sep 17 00:00:00 2001 +From: Richard Marko +Date: Mon, 16 Oct 2023 15:26:33 +0200 +Subject: [PATCH] util/kconfig: chmod +w before savedefconfig + +This prevents a headscratcher when .config in root doesn't have a write +permission bit set which causes a build failure of savedefconfig +not able to write to copied file, for example + +*** Error while saving defconfig to: + build/mainboard/emulation/qemu-i440fx/cbfs-file.eU5E0t.out.tmp2 + +Change-Id: I2e7d35c9f6e8add3e7438d163850bc5fda5a99b2 +Signed-off-by: Richard Marko +--- + util/kconfig/Makefile.inc | 1 + + 1 file changed, 1 insertion(+) + +Index: kconfig/Makefile.inc +=================================================================== +--- kconfig.orig/Makefile.inc ++++ kconfig/Makefile.inc +@@ -34,6 +34,7 @@ oldconfig: KCONFIG_STRICT= + + savedefconfig: $(objk)/conf + cp $(DOTCONFIG) $(DEFCONFIG) ++ chmod +w $(DEFCONFIG) + $< --savedefconfig=$(DEFCONFIG) $(KBUILD_KCONFIG) + + FORCE: diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series index 655c493868..252eb64b9a 100644 --- a/util/kconfig/patches/series +++ b/util/kconfig/patches/series @@ -10,3 +10,4 @@ 0010-reenable-source-in-choice.patch 0013-util-kconfig-detect-ncurses-on-FreeBSD.patch 0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch +0015-util-kconfig-chmod-w-before-savedefconfig.patch