From 353bf93bb5b5ac6ef9ed75c3fb70c28053258f17 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 7 Jan 2023 18:07:11 +0100
Subject: [PATCH] armbian-next: uefi-common: `declare -g`, not `export`

---
 .../sources/families/include/uefi_common.inc  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/config/sources/families/include/uefi_common.inc b/config/sources/families/include/uefi_common.inc
index aed91744cf..bd8aee8b56 100644
--- a/config/sources/families/include/uefi_common.inc
+++ b/config/sources/families/include/uefi_common.inc
@@ -1,29 +1,29 @@
-export SERIALCON="tty1"                          # Cant reasonably expect UEFI stuff to have a serial console. Customize if otherwise.
-export SKIP_BOOTSPLASH="yes"                     # No splash.
-export UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Default 3-seconds timeout for GRUB menu.
-export BOARD_FIRMWARE_INSTALL="-full"            # Install full firmware for UEFI boards
+declare -g SERIALCON="tty1"                          # Cant reasonably expect UEFI stuff to have a serial console. Customize if otherwise.
+declare -g SKIP_BOOTSPLASH="yes"                     # No splash.
+declare -g UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Default 3-seconds timeout for GRUB menu.
+declare -g BOARD_FIRMWARE_INSTALL="-full"            # Install full firmware for UEFI boards
 case "${BRANCH}" in
 
 	ddk)
 		# This will force `unset KERNELSOURCE` later; no kernel will be built.
 		# Instead, the distro's default linux-generic kernel will be installed.
-		export DISTRO_GENERIC_KERNEL=yes
+		declare -g DISTRO_GENERIC_KERNEL=yes
 		;;
 
 	current)
-		export DISTRO_GENERIC_KERNEL=no
-		export LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
-		export KERNEL_MAJOR_MINOR="5.15"                      # Major and minor versions of this kernel. For mainline caching.
-		export KERNELBRANCH="branch:linux-5.15.y"             # Branch or tag to build from. It should match MAJOR_MINOR
-		export KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
+		declare -g DISTRO_GENERIC_KERNEL=no
+		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
+		declare -g KERNEL_MAJOR_MINOR="5.15"                      # Major and minor versions of this kernel. For mainline caching.
+		declare -g KERNELBRANCH="branch:linux-5.15.y"             # Branch or tag to build from. It should match MAJOR_MINOR
+		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		;;
 
 	edge)
-		export DISTRO_GENERIC_KERNEL=no
-		export LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
-		export KERNEL_MAJOR_MINOR="6.1"                       # Major and minor versions of this kernel. For mainline caching.
-		export KERNELBRANCH="branch:linux-6.1.y"              # Branch or tag to build from. It should match MAJOR_MINOR
-		export KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
+		declare -g DISTRO_GENERIC_KERNEL=no
+		declare -g LINUXCONFIG="linux-uefi-${LINUXFAMILY}-${BRANCH}"
+		declare -g KERNEL_MAJOR_MINOR="6.1"                       # Major and minor versions of this kernel. For mainline caching.
+		declare -g KERNELBRANCH="branch:linux-6.1.y"              # Branch or tag to build from. It should match MAJOR_MINOR
+		declare -g KERNELPATCHDIR="uefi-${LINUXFAMILY}-${BRANCH}" # Might be empty.
 		;;
 esac
 
@@ -31,19 +31,19 @@ if [[ "${QEMU_UBOOT_BOOTCONFIG}" != "" ]]; then
 	# Allowance for using the UEFI kernels, but not an UEFI bootloader, instead, use qemu with uboot.
 	# Used in the qemu-uboot-x86 and qemu-uboot-arm64 "boards".
 	display_alert "Using UEFI as base for qemu-uboot-${LINUXFAMILY}" "Using BOOTCONFIG: ${QEMU_UBOOT_BOOTCONFIG}" "debug"
-	export ATF_COMPILE="no"
-	export BOOTSCRIPT="boot-qemu-${LINUXFAMILY}.cmd:boot.cmd"
-	export BOOTDIR="qemu-uboot-${LINUXFAMILY}"
-	export BOOTSOURCE='https://source.denx.de/u-boot/u-boot.git'
-	export BOOTBRANCH='tag:v2022.10'
-	export UBOOT_TARGET_MAP="all;;u-boot.rom"                   # Can't find the target that produces 'u-boot.rom', so for now 'make all'
-	export PACKAGE_LIST_FAMILY="spice-vdagent qemu-guest-agent" # Nice-to-have packages for running under qemu
-	export BOOTCONFIG="${QEMU_UBOOT_BOOTCONFIG}"
-	export PACKAGE_LIST_FAMILY_REMOVE="plymouth" # Nice-to-have packages for running under qemu
-	export PLYMOUTH="no"                         # try with smaller initrd?
+	declare -g ATF_COMPILE="no"
+	declare -g BOOTSCRIPT="boot-qemu-${LINUXFAMILY}.cmd:boot.cmd"
+	declare -g BOOTDIR="qemu-uboot-${LINUXFAMILY}"
+	declare -g BOOTSOURCE='https://source.denx.de/u-boot/u-boot.git'
+	declare -g BOOTBRANCH='tag:v2022.10'
+	declare -g UBOOT_TARGET_MAP="all;;u-boot.rom"                   # Can't find the target that produces 'u-boot.rom', so for now 'make all'
+	declare -g PACKAGE_LIST_FAMILY="spice-vdagent qemu-guest-agent" # Nice-to-have packages for running under qemu
+	declare -g BOOTCONFIG="${QEMU_UBOOT_BOOTCONFIG}"
+	declare -g PACKAGE_LIST_FAMILY_REMOVE="plymouth" # Nice-to-have packages for running under qemu
+	declare -g PLYMOUTH="no"                         # try with smaller initrd?
 
 	# A patch to convert to `q35` machine type DTS (x86 only)
-	export BOOTPATCHDIR="u-boot-qemu-${LINUXFAMILY}"
+	declare -g BOOTPATCHDIR="u-boot-qemu-${LINUXFAMILY}"
 
 	# Config for the qcow2 image
 	declare -g QCOW2_RESIZE_AMOUNT="+50G" # resize the qcow2 image to be 50G bigger