From 59d9bce33221bc1612c6b73625415b0742cb87fd Mon Sep 17 00:00:00 2001
From: Juerg Haefliger <juerg.haefliger@canonical.com>
Date: Tue, 24 Jan 2023 14:03:12 +0100
Subject: [PATCH] UBUNTU: [Packaging] debian/rules: Bring back 'editconfigs'

With the switch to the new annotations-only mechanism and the new
annotations script, the 'editconfigs' target was dropped for some
reason. It's usefull so bring it back.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian/rules.d/1-maintainer.mk   |  3 ++-
 debian/scripts/misc/kernelconfig | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index a58004893dd1..b18f9d225ff1 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -9,6 +9,7 @@ help:
 	@echo "  updateconfigs       : Update core arch configs"
 	@echo "  defaultconfigs      : Update core arch configs using defaults"
 	@echo "  genconfigs          : Generate core arch configs in CONFIGS/*"
+	@echo "  editconfigs         : Edit core arch configs"
 	@echo "  migrateconfigs      : Automatically import old configs into annotations"
 	@echo "  printchanges        : Print the current changelog entries (from git)"
 	@echo "  insertchanges       : Insert current changelog entries (from git)"
@@ -40,7 +41,7 @@ migrateconfigs:
 	fi
 	rm -rf build
 
-configs-targets := updateconfigs defaultconfigs genconfigs
+configs-targets := updateconfigs defaultconfigs genconfigs editconfigs
 
 .PHONY: $(configs-targets)
 $(configs-targets):
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index b4b08ad83d29..a3559f323b57 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -25,7 +25,7 @@ if [ -z "${gcc:-}" ] ; then
 fi
 
 if [ ${#} -ne 1 ] ; then
-	echo "Usage: $0 updateconfigs|defaultconfigs|genconfigs"
+	echo "Usage: $0 updateconfigs|defaultconfigs|genconfigs|editconfigs"
 	exit 2
 fi
 
@@ -35,6 +35,7 @@ case "${mode}" in
 	updateconfigs)  target="syncconfig" ;;
 	defaultconfigs) target="olddefconfig" ;;
 	genconfigs)     target="oldconfig" ;;
+	editconfigs)    ;;  # Target is set later based on user input
 	*) echo "ERROR: Invalid mode: ${1}" >&2
 	   exit 1 ;;
 esac
@@ -85,6 +86,17 @@ EOF
 		continue
 	fi
 
+	if [ "${mode}" = "editconfigs" ] ; then
+		while true ; do
+			echo -n "Do you want to edit configs for ${arch}-${flavour}? [Y/n] "
+			read -r choice
+			case "${choice,,}" in
+				y|"") target="menuconfig" ; break ;;
+				n)    target="syncconfig" ; break ;;
+			esac
+		done
+	fi
+
 	rm -rf build
 	mkdir build