Merge various package variables into PREFERED_PROVIDER array

This commit merges LINUXPKG and RELEASEPKG into a single associative
array named PREFERED_PROVIDER.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>

check_update.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 
 # dummy toolchain variables
-export LINUXPKG="linux"
+PREFERED_PROVIDER[linux]="linux"
 export LAYERCONF=""
 
 # utilities

layer/bsp-alix/TOOLCHAIN

@@ -1,4 +1,3 @@
-RELEASEPKG="release-alix"
 TARGET="i586-linux-musl"
 GCC_CPU="geode"
 
@@ -7,7 +6,9 @@ CPU_IS_64BIT="no"
 GCC_EXTRACFG="--disable-libmpx --disable-cet"
 BINUTILS_EXTRACFG="--disable-cet"
 
-LINUXPKG="linux"
+PREFERED_PROVIDER[linux]="linux"
+PREFERED_PROVIDER[release]="release-alix"
+
 LINUX_TGT="bzImage modules"
 
 TC_HARDENING="no"

layer/bsp-qemu64/TOOLCHAIN

@@ -1,4 +1,3 @@
-RELEASEPKG="release-qemu"
 TARGET="x86_64-linux-musl"
 GCC_CPU="x86-64"
 
@@ -7,7 +6,9 @@ CPU_IS_64BIT="yes"
 GCC_EXTRACFG="--enable-libmpx"
 BINUTILS_EXTRACFG=""
 
-LINUXPKG="linux"
+PREFERED_PROVIDER[linux]="linux"
+PREFERED_PROVIDER[release]="release-qemu"
+
 LINUX_TGT="bzImage"
 
 TC_HARDENING="no"

layer/bsp-rpi3/TOOLCHAIN

@@ -1,4 +1,3 @@
-RELEASEPKG="release-rpi3"
 TARGET="arm-linux-musleabihf"
 GCC_CPU="armv6"
 
@@ -7,7 +6,9 @@ CPU_IS_64BIT="no"
 GCC_EXTRACFG="--with-float=hard --with-fpu=neon-vfpv3"
 BINUTILS_EXTRACFG=""
 
-LINUXPKG="linux-rpi3"
+PREFERED_PROVIDER[linux]="linux-rpi3"
+PREFERED_PROVIDER[release]="release-rpi3"
+
 LINUX_TGT="zImage dtbs modules"
 
 TC_HARDENING="no"

mk.sh

@@ -31,6 +31,8 @@ REPODIR="$BUILDROOT/repo"
 DEPENDSLIST="$BUILDROOT/depends"
 PROVIDESLIST="$BUILDROOT/provides"
 
+declare -A PREFERED_PROVIDER
+
 mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
 mkdir -p "$REPODIR"
 
@@ -82,8 +84,8 @@ for pkg in $SCRIPTDIR/pkg/*; do
 	done
 done
 
-pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" "$RELEASEPKG" \
-    > "$PACKAGELIST"
+pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" \
+    "${PREFERED_PROVIDER[release]}" > "$PACKAGELIST"
 cat "$PACKAGELIST"
 
 echo "--- building packages ---"

pkg/linux_headers/build

@@ -1,5 +1,5 @@
 # inherit package details from kernel package
-source "$SCRIPTDIR/pkg/$LINUXPKG/build"
+source "$SCRIPTDIR/pkg/${PREFERED_PROVIDER[linux]}/build"
 DEPENDS="tc-pkgtool"
 SUBPKG="linux-dev"