linux-kernel - [PATCH v2] kconfig: add KCONFIG_ALLCONFIG support for tinyconfig

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <87v8wo25we.fsf@irisa.fr>
Date:   Tue, 08 Mar 2022 09:34:16 +0100
From:   Randrianaina Georges Aaron <georges-aaron.randrianaina@...sa.fr>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org,
        Mathieu Acher <mathieu.acher@...sa.fr>
Subject: [PATCH v2] kconfig: add KCONFIG_ALLCONFIG support for tinyconfig

Since f8f0d06438e5, tinyconfig overrides KCONFIG_ALLCONFIG to include
kernel/configs/tiny-base.config. However, this ignores user's preset if
defined.

This modification checks if the user has set KCONFIG_ALLCONFIG and if so,
concatenates it with kernel/configs/tiny-base.config to be used as preset
config symbols.

Changes in v2:
- Remove `<(echo)` in the cat command as it is not portable
- Add $(srctree) in presets' path to make it compatible with O=<dir>

Signed-off-by: Randrianaina Georges Aaron <georges-aaron.randrianaina@...sa.fr>
---
 scripts/kconfig/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index b8ef0fb4bbef..58a677db9a73 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -102,7 +102,13 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 
 PHONY += tinyconfig
 tinyconfig:
+ifeq ($(KCONFIG_ALLCONFIG),)
 	$(Q)KCONFIG_ALLCONFIG=kernel/configs/tiny-base.config $(MAKE) -f $(srctree)/Makefile allnoconfig
+else
+	$(Q)cat $(srctree)/$(KCONFIG_ALLCONFIG) $(srctree)/kernel/configs/tiny-base.config > $(srctree)/.tmp.config
+	$(Q)KCONFIG_ALLCONFIG=$(srctree)/.tmp.config $(MAKE) -f $(srctree)/Makefile allnoconfig
+	$(Q)rm -f $(srctree)/.tmp.config
+endif
 	$(Q)$(MAKE) -f $(srctree)/Makefile tiny.config
 
 # CHECK: -o cache_dir=<path> working?
-- 
2.34.1