rootfs: allow APA to handle GPG keys when it is active during the build

this is a small first step to mainlining APA into core and let it handle
some packaging and distribution logic

Author: leggewie

lib/functions/rootfs/distro-specific.sh

@@ -80,6 +80,8 @@ function create_sources_list_and_deploy_repo_key() {
 
 	declare distro=""
 
+	APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg"
+
 	# Drop deboostrap sources leftovers
 	rm -f "${basedir}/etc/apt/sources.list"
 
@@ -157,21 +159,23 @@ function create_sources_list_and_deploy_repo_key() {
 			;;
 	esac
 
-	# add armbian key
-	display_alert "Adding Armbian repository and authentication key" "${when} :: /etc/apt/sources.list.d/armbian.sources" "info"
-	mkdir -p "${basedir}"/usr/share/keyrings
-	# change to binary form
-	APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg"
-	gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"
-
-	# lets link to the old file as armbian-config uses it and we can't set there to new file
-	# we user force linking as some old caches still exists
-	chroot "${basedir}" /bin/bash -c "ln -fs armbian-archive-keyring.gpg /usr/share/keyrings/armbian.gpg"
-
-	# lets keep old way for old distributions
-	if [[ "${RELEASE}" =~ (focal|bullseye) ]]; then
-		cp "${SRC}"/config/armbian.key "${basedir}"
-		chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1"
+	# code to be made obsolete by making APA part of Armbian Core. #XXX
+	if [ ! $APA_IS_ACTIVE = "true" ]; then
+		# add armbian key
+		display_alert "Adding Armbian repository and authentication key" "${when} :: /etc/apt/sources.list.d/armbian.sources" "info"
+		mkdir -p "${basedir}"/usr/share/keyrings
+		# change to binary form
+		gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"
+
+		# lets link to the old file as armbian-config uses it and we can't set there to new file
+		# we user force linking as some old caches still exists
+		chroot "${basedir}" /bin/bash -c "ln -fs armbian-archive-keyring.gpg /usr/share/keyrings/armbian.gpg"
+
+		# lets keep old way for old distributions
+		if [[ "${RELEASE}" =~ (focal|bullseye) ]]; then
+			cp "${SRC}"/config/armbian.key "${basedir}"
+			chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1"
+		fi
 	fi
 
 	# Add Armbian APT repository