Squashed 'scripts/kconfig/' changes from d2ca262..d263320

d263320 kconfig.Makefile: remove .mconf-cfg and .nconf-cfg dependency
90bdd1b Makefile: fix ordering to account for parser and lexical analyzer changes
7038293 kconfig: fixes and sync to next-20240830
cc6e694 kconfig: sync to next-20240823
67a7737 update-upstream-kconfig.sh: account for list.h move
dce7653 kconfig: fix parallel builds for menuconfig
00828d7 kconfig.Makefile: allow dynamic Kconfig generation
43ccad2 README.kconfig
98bda61 README.kconfig: add fio-tests
71c4377 .gitignore: ignore *.o files
ec3a810 kconfig.Makefile: use KCONFIG_DIR
ed6c1d6 README.kconfig: add projects using this subtree
6a80663 .gitignore: expand to add more junk
882cbaa add internal.h from upstream linux
0fb0075 Makefile: process parser.tab.o before lexer.lex.o
ff7edd2 .gitignore / clean: add parser.tab.c and .lex.c to clean
754427d kconfig.Makefile: fix usage of setlocalversion
bb58485 kconfig: sync up to linux-next next-20220204
12c2c4c Fix directory targets
be25db5 Add .gitignore again
7e02172 kconfig.Makefile: use local directory for helper
e7941cd kconfig: move all data to local directory
37b6768 Move all files to kconfig directory
1f32753 scripts: move scripts to local directory
1f591b9 Provide license and basic README
2bf95cc Initial import
REVERT: d2ca262 linux: generate refs automatically
REVERT: bd240c8 Initial import: kdevops goes on a diet

git-subtree-dir: scripts/kconfig
git-subtree-split: d263320

Author: mcgrof

.gitignore

@@ -22,3 +22,6 @@ parser.tab.c
 lxdialog/*.o.cmd
 lxdialog/*.o
 
+*conf-bin
+*conf-cflags
+*conf-libs

Kbuild.include

@@ -16,6 +16,10 @@ empty   :=
 space   := $(empty) $(empty)
 space_escape := _-_SPACE_-_
 pound := \#
+define newline
+
+
+endef
 
 ###
 # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -45,6 +49,16 @@ escsq = $(subst $(squote),'\$(squote)',$1)
 silent_kecho := :
 kecho := $($(quiet)kecho)
 
+###
+# Read a file, replacing newlines with spaces
+#
+# Make 4.2 or later can read a file by using its builtin function.
+ifneq ($(filter-out 4.0 4.1, $(MAKE_VERSION)),)
+read-file = $(subst $(newline),$(space),$(file < $1))
+else
+read-file = $(shell cat $1 2>/dev/null)
+endif
+
 ###
 # filechk is used to check if the content of a generated file is updated.
 # Sample usage:
@@ -71,3 +85,77 @@ define filechk
 		mv -f [email protected] $@;		\
 	fi
 endef
+
+# pring log
+#
+# If quiet is "silent_", print nothing and sink stdout
+# If quiet is "quiet_", print short log
+# If quiet is empty, print short log and whole command
+silent_log_print = exec >/dev/null;
+ quiet_log_print = $(if $(quiet_cmd_$1), echo '  $(call escsq,$(quiet_cmd_$1)$(why))';)
+       log_print = echo '$(pound) $(call escsq,$(or $(quiet_cmd_$1),cmd_$1 $@)$(why))'; \
+                   echo '  $(call escsq,$(cmd_$1))';
+
+# Delete the target on interruption
+#
+# GNU Make automatically deletes the target if it has already been changed by
+# the interrupted recipe. So, you can safely stop the build by Ctrl-C (Make
+# will delete incomplete targets), and resume it later.
+#
+# However, this does not work when the stderr is piped to another program, like
+#  $ make >&2 | tee log
+# Make dies with SIGPIPE before cleaning the targets.
+#
+# To address it, we clean the target in signal traps.
+#
+# Make deletes the target when it catches SIGHUP, SIGINT, SIGQUIT, SIGTERM.
+# So, we cover them, and also SIGPIPE just in case.
+#
+# Of course, this is unneeded for phony targets.
+delete-on-interrupt = \
+	$(if $(filter-out $(PHONY), $@), \
+		$(foreach sig, HUP INT QUIT TERM PIPE, \
+			trap 'rm -f $@; trap - $(sig); kill -s $(sig) $$$$' $(sig);))
+
+# print and execute commands
+cmd = @$(if $(cmd_$(1)),set -e; $($(quiet)log_print) $(delete-on-interrupt) $(cmd_$(1)),:)
+
+###
+# why - tell why a target got built
+#       enabled by make V=2
+#       Output (listed in the order they are checked):
+#          (1) - due to target is PHONY
+#          (2) - due to target missing
+#          (3) - due to: file1.h file2.h
+#          (4) - due to command line change
+#          (5) - due to missing .cmd file
+#          (6) - due to target not in $(targets)
+# (1) PHONY targets are always build
+# (2) No target, so we better build it
+# (3) Prerequisite is newer than target
+# (4) The command line stored in the file named dir/.target.cmd
+#     differed from actual command line. This happens when compiler
+#     options changes
+# (5) No dir/.target.cmd file (used to store command line)
+# (6) No dir/.target.cmd file and target not listed in $(targets)
+#     This is a good hint that there is a bug in the kbuild file
+ifneq ($(findstring 2, $(KBUILD_VERBOSE)),)
+_why =                                                                        \
+    $(if $(filter $@, $(PHONY)),- due to target is PHONY,                    \
+        $(if $(wildcard $@),                                                 \
+            $(if $(newer-prereqs),- due to: $(newer-prereqs),                \
+                $(if $(cmd-check),                                           \
+                    $(if $(savedcmd_$@),- due to command line change,        \
+                        $(if $(filter $@, $(targets)),                       \
+                            - due to missing .cmd file,                      \
+                            - due to $(notdir $@) not in $$(targets)         \
+                         )                                                   \
+                     )                                                       \
+                 )                                                           \
+             ),                                                              \
+             - due to target missing                                         \
+         )                                                                   \
+     )
+
+why = $(space)$(strip $(_why))
+endif

Makefile

@@ -6,64 +6,72 @@
 #
 # Part of the https://github.com/mcgrof/kconfig.git
 
-CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
-LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o
+CFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes
+CFLAGS += -O2 -fomit-frame-pointer
+CFLAGS += -I ./
+lxdialog        := $(addprefix lxdialog/, \
+		checklist.o inputbox.o menubox.o textbox.o util.o yesno.o)
 
-default: mconf
+kconfig: conf mconf nconf
 
-common-objs := confdata.o expr.o menu.o parser.tab.o lexer.lex.c \
-                   preprocess.o symbol.o util.o
+common-objs     := lexer.lex.o parser.tab.o confdata.o expr.o menu.o \
+		   preprocess.o symbol.o util.o
 
-lexer.lex.c: lexer.l
+lexer.lex.c: lexer.l parser.tab.h
 	@flex -olexer.lex.c -L lexer.l
 
-parser.tab.c: parser.y
+parser.tab.c parser.tab.h: parser.y
 	@bison -oparser.tab.c --defines=parser.tab.h -t -l parser.y
 
-conf: conf.o $(common-objs)
-	$(CC) -o conf $^
+conf: $(common-objs) conf.o
+	$(CC) -o conf -I./ $^
 
-mconf_CFLAGS :=  $(shell test -f $(CURDIR)/.mconf-cfg && . $(CURDIR)/.mconf-cfg && echo $$cflags) -DLOCALE
-mconf_LDFLAGS := $(shell test -f $(CURDIR)/.mconf-cfg && . $(CURDIR)/.mconf-cfg && echo $$libs)
-mconf: CFLAGS += ${mconf_CFLAGS}
+HOSTLDLIBS_nconf       = $(call read-file, nconf-libs)
+HOSTCFLAGS_nconf.o     = $(call read-file, nconf-cflags)
+nconf: CFLAGS += ${HOSTCFLAGS_nconf.o}
 
-nconf_CFLAGS :=  $(shell test -f $(CURDIR)/.nconf-cfg && . $(CURDIR)/.nconf-cfg && echo $$cflags) -DLOCALE
-nconf_LDFLAGS := $(shell test -f $(CURDIR)/.nconf-cfg && . $(CURDIR)/.nconf-cfg && echo $$libs)
-nconf: CFLAGS += ${nconf_CFLAGS}
+HOSTLDLIBS_mconf = $(call read-file, mconf-libs)
+$(foreach f, mconf.o $(lxdialog), \
+  $(eval HOSTCFLAGS_$f = $$(call read-file, mconf-cflags)))
+mconf: CFLAGS += ${HOSTCFLAGS_mconf.o}
 
+export HOSTPKG_CONFIG := pkg-config
 include $(CURDIR)/Kbuild.include
 # check if necessary packages are available, and configure build flags
-define filechk_conf_cfg
-	$(CURDIR)/$<
-endef
+cmd_conf_cfg = $(CURDIR)/$< $(addprefix $*conf-, cflags libs bin); touch $*conf-bin
 
-.%conf-cfg: %conf-cfg.sh
-	$(call filechk,conf_cfg)
+%conf-cflags %conf-libs %conf-bin: %conf-cfg.sh
+	$(call cmd,conf_cfg)
 
-MCONF_DEPS := mconf.o $(LXDIALOG) $(common-objs)
-mconf: .mconf-cfg conf $(MCONF_DEPS)
-	$(CC) -o mconf $(MCONF_DEPS) $(mconf_LDFLAGS)
+MCONF_DEPS := $(common-objs) mconf.o $(lxdialog) mnconf-common.o
+mconf:   | mconf-libs
+mconf.o: | mconf-cflags
+mconf: $(MCONF_DEPS) conf
+	$(CC) -o mconf -I./ $(MCONF_DEPS) $(HOSTLDLIBS_mconf)
 
-NCONF_DEPS := nconf.o nconf.gui.o parser.tab.c
-nconf: .nconf-cfg conf $(NCONF_DEPS)
-	$(CC) -o nconf $(NCONF_DEPS) $(nconf_LDFLAGS)
+NCONF_DEPS := $(common-objs) nconf.o nconf.gui.o mnconf-common.o
+nconf:   | nconf-libs
+nconf.o: | nconf-cflags
+nconf: $(NCONF_DEPS) conf
+	$(CC) -o nconf $(NCONF_DEPS) $(HOSTLDLIBS_nconf)
+
+clean-files := conf mconf conf
+clean-files += *.o lxdialog/*.o
+clean-files += parser.tab.c parser.tab.h .lex.c
+clean-files += *conf-cflags *conf-libs *conf-bin
 
 .PHONY: help
 help:
 	@echo "Configuration options:"
+	@echo "kconfig            - builds only requirements menuconfig and nconfig"
 	@echo "menuconfig         - demos the menuconfig functionality"
 	@echo "nconfig            - demos the nconfig functionality"
 	@echo "allyesconfig       - enables all bells and whistles"
 	@echo "allnoconfig        - disables all bells and whistles"
 	@echo "randconfig         - random configuration"
 	@echo "defconfig-*        - If you have files in the defconfig directory use default config from there"
-	@echo
-	@echo "Variable options:"
-	@echo "make V=n [targets] 1: verbose build (Makefile)"
-	@echo "                   2: verbose playbooks (Ansible)"
-	@echo "                   V=1 and V=2 can be combined with V=12"
 
 .PHONY: clean
 clean:
-	@rm -f conf mconf conf *.o lxdialog/*.o *.o parser.tab.c .mconf-cfg *.lex.c
+	@rm -f $(clean-files)
 	@rm -rf *.o.d

array_size.h

@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef ARRAY_SIZE_H
+#define ARRAY_SIZE_H
+
+/**
+ * ARRAY_SIZE - get the number of elements in array @arr
+ * @arr: array to be sized
+ */
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+#endif /* ARRAY_SIZE_H */