From 2340fa29125291b1db770616fcdc96a8ac1d103e Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 14 Dec 2020 21:44:00 +1300 Subject: Don't generate empty help Kconfig now complains when we have a help section with no text. If there is nothing in @@help@@ don't output a `help` section. Signed-off-by: Chris Packham --- maintainer/kconfig-choice.template | 2 ++ maintainer/kconfig-menu.template | 2 ++ 2 files changed, 4 insertions(+) (limited to 'maintainer') diff --git a/maintainer/kconfig-choice.template b/maintainer/kconfig-choice.template index bd0c4744..6f03707b 100644 --- a/maintainer/kconfig-choice.template +++ b/maintainer/kconfig-choice.template @@ -11,7 +11,9 @@ config @@dir|@@_@@choice|@@ #!foreach dependency @@depline@@ #!end-foreach +#!if [ -n "@@*help@@" ] help +#!end-if #!foreach help @@helpline@@ #!end-foreach diff --git a/maintainer/kconfig-menu.template b/maintainer/kconfig-menu.template index 4892435d..1f5e7b2e 100644 --- a/maintainer/kconfig-menu.template +++ b/maintainer/kconfig-menu.template @@ -8,7 +8,9 @@ menuconfig @@dir|@@_@@choice|@@ #!foreach dependency @@depline@@ #!end-foreach +#!if [ -n "@@*help@@" ] help +#!end-if #!foreach help @@helpline@@ #!end-foreach -- cgit v1.2.3 From 30bffa96b215a16c3adc88446d3d2ecc66d4450b Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Tue, 2 Feb 2021 21:25:22 +1300 Subject: don't nest choices New versions of Kconfig won't allow choices to be nested. Update the kconfig template accordingly. Signed-off-by: Chris Packham --- maintainer/kconfig-versions.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maintainer') diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index 19693548..51bb28c0 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -68,6 +68,8 @@ config @@fork|@@_SRC_DEVEL Default is the vendor repository at @@repository_url@@ #!end-if +endchoice + if @@fork|@@_SRC_DEVEL choice @@ -176,8 +178,6 @@ config @@fork|@@_CUSTOM_LOCATION endif -endchoice - if EXPERIMENTAL choice bool "@@pkg_label@@ patches origin" -- cgit v1.2.3