From 8de69482513ce8c0e36269c980d3a5fc6a020c7f Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Sun, 19 Jan 2025 15:23:45 +0100
Subject: [PATCH] Enable armbian-config as extension

---
 extensions/armbian-config.sh               | 6 ++++++
 lib/functions/configuration/main-config.sh | 3 +++
 lib/functions/rootfs/distro-agnostic.sh    | 5 -----
 lib/functions/rootfs/distro-specific.sh    | 5 -----
 4 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 extensions/armbian-config.sh

diff --git a/extensions/armbian-config.sh b/extensions/armbian-config.sh
new file mode 100644
index 000000000000..79240e74b284
--- /dev/null
+++ b/extensions/armbian-config.sh
@@ -0,0 +1,6 @@
+# Install armbian config from repo. Now it is producing externally https://github.com/armbian/configng
+# and they are moved to main armbian repo periodically
+#
+function post_armbian_repo_customize_image__install_armbian-config() {
+	chroot_sdcard_apt_get_install "armbian-config"
+}
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index 87e505e50f77..a2c5878fa996 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -61,6 +61,9 @@ function do_main_configuration() {
 
 	declare -g SKIP_EXTERNAL_TOOLCHAINS="${SKIP_EXTERNAL_TOOLCHAINS:-yes}" # don't use any external toolchains, by default.
 
+	# Armbian config is central tool used in all builds. As its build externally, we have moved it to extension. Enable it here.
+	enable_extension "armbian-config"
+
 	# Network stack to use, default to network-manager; configuration can override this.
 	# Will be made read-only further down.
 	declare -g NETWORKING_STACK="${NETWORKING_STACK}"
diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 8fd6556aab46..83361914a184 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -331,11 +331,6 @@ function install_distribution_agnostic() {
 		desktop_postinstall
 	fi
 
-	# install armbian-config from GitHub repo added in distro-specific.sh
-	if [[ "${PACKAGE_LIST_RM}" != *armbian-config* ]]; then
-		chroot_sdcard_apt_get_install_dry_run "armbian-config"
-	fi
-
 	# install armbian-zsh
 	if [[ "${PACKAGE_LIST_RM}" != *armbian-zsh* ]]; then
 		if [[ $BUILD_MINIMAL != yes ]]; then
diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh
index a636bd3c471c..db40363be3ff 100644
--- a/lib/functions/rootfs/distro-specific.sh
+++ b/lib/functions/rootfs/distro-specific.sh
@@ -185,11 +185,6 @@ function create_sources_list_and_deploy_repo_key() {
 		echo "deb ${SIGNED_BY}http://$([[ $BETA == yes ]] && echo "beta" || echo "apt").armbian.com $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list
 	fi
 
-	# add armbian-config repository
-	cat <<- EOF > "${basedir}"/etc/apt/sources.list.d/armbian-config.list
-	deb ${SIGNED_BY} https://github.armbian.com/configng stable main
-	EOF
-
 	# replace local package server if defined. Suitable for development
 	[[ -n $LOCAL_MIRROR ]] && echo "deb ${SIGNED_BY}http://$LOCAL_MIRROR $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list