3 files changed, 23 insertions, 0 deletions
diff --git a/maintainer/kconfig-choice.template b/maintainer/kconfig-choice.template
index b2ca2176..affaf65d 100644
--- a/maintainer/kconfig-choice.template
+++ b/maintainer/kconfig-choice.template
@@ -25,8 +25,22 @@ config @@dir|@@
     default "@@choice@@" if @@dir|@@_@@choice|@@
 #!end-foreach
 
+config @@dir|@@_CHOICE_KSYM
+    string
+#!foreach choice
+    default "@@choice|@@" if @@dir|@@_@@choice|@@
+#!end-foreach
+
 #!foreach choice
 if @@dir|@@_@@choice|@@
+config @@dir|@@_@@choice|@@_PKG_KSYM
+    string
+    default "@@pkg|@@"
+
+#!if [ -n "@@pkg@@" ]
+source "config/versions/@@pkg@@.in"
+#!end-if
 source "config/@@dir@@/@@choice@@.in"
 endif
+
 #!end-foreach
diff --git a/maintainer/kconfig-menu.template b/maintainer/kconfig-menu.template
index 1a7daa5f..3e32e16c 100644
--- a/maintainer/kconfig-menu.template
+++ b/maintainer/kconfig-menu.template
@@ -14,6 +14,13 @@ menuconfig @@dir|@@_@@choice|@@
 #!end-foreach
 
 if @@dir|@@_@@choice|@@
+config @@dir|@@_@@choice|@@_PKG_KSYM
+    string
+    default "@@pkg|@@"
+
+#!if [ -n "@@pkg@@" ]
+source "config/versions/@@pkg@@.in"
+#!end-if
 source "config/@@dir@@/@@choice@@.in"
 endif
 
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index e4be903b..37461b7d 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -243,6 +243,8 @@ config @@fork|@@_VERSION
 #!foreach version
     default "@@ver@@" if @@fork|@@_V_@@ver_sel|@@
 #!end-foreach
+    default "new" if @@fork|@@_VERY_NEW
+    default "old" if @@fork|@@_VERY_OLD
     default "unknown"
 
 #!if [ "@@#version@@" -gt 0 ]