summaryrefslogtreecommitdiff
path: root/maintainer
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2021-02-08 07:49:36 (GMT)
committerGitHub <noreply@github.com>2021-02-08 07:49:36 (GMT)
commit5b0e0127e189c08e433ae25dbceead63da5ef2d7 (patch)
treebc9619a09931ac13904711ebf2721c7b2f355bce /maintainer
parent30316cd27ab0a6f8cb2a96771661fc88e1b05a6b (diff)
parentd0e328c8ad357a705b6218e20f74ec1ec1869e8d (diff)
Merge pull request #1430 from cpackham/kconfig-update
Kconfig update
Diffstat (limited to 'maintainer')
-rw-r--r--maintainer/kconfig-choice.template2
-rw-r--r--maintainer/kconfig-menu.template2
-rw-r--r--maintainer/kconfig-versions.template4
3 files changed, 6 insertions, 2 deletions
diff --git a/maintainer/kconfig-choice.template b/maintainer/kconfig-choice.template
index bd0c474..6f03707 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 4892435..1f5e7b2 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
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 1969354..51bb28c 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"