From f17fba608042e504f8506d51699dae8acc9abcea Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 9 Jun 2021 20:35:53 +1200
Subject: Move SRC_CUSTOM inside choice

Prior to commit 30bffa96 SRC_CUSTOM was inside the choice with
SRC_RELEASE and SRC_DEVEL making the 3 options mutually exclusive.
Restore this behaviour keeping the "fix" to keep kconfig happy.

Fixes #1151
Fixes: 30bffa96 ("don't nest choices")
Signed-off-by: Chris Packham <judge.packham@gmail.com>

diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 51bb28c..77f1012 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -68,6 +68,12 @@ config @@fork|@@_SRC_DEVEL
       Default is the vendor repository at @@repository_url@@
 #!end-if
 
+config @@fork|@@_SRC_CUSTOM
+    bool "Custom location"
+    depends on EXPERIMENTAL
+    help
+      Custom directory or tarball.
+
 endchoice
 
 if @@fork|@@_SRC_DEVEL
@@ -163,12 +169,6 @@ config @@fork|@@_DEVEL_BOOTSTRAP
 
 endif
 
-config @@fork|@@_SRC_CUSTOM
-    bool "Custom location"
-    depends on EXPERIMENTAL
-    help
-      Custom directory or tarball.
-
 if @@fork|@@_SRC_CUSTOM
 
 config @@fork|@@_CUSTOM_LOCATION
-- 
cgit v0.10.2-6-g49f6