diff options
| -rwxr-xr-x | functions/configuration.sh | 4 | ||||
| -rwxr-xr-x | scripts/build/config | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh index 8bacb52bc..decc564be 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -234,6 +234,10 @@ Prepare_config () LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}" + # first, handle existing LB_LINUX_FLAVOURS for backwards compatibility + if [ -n "${LB_LINUX_FLAVOURS}" ]; then + LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS}" + fi case "${LB_ARCHITECTURES}" in arm64) LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-arm64}" diff --git a/scripts/build/config b/scripts/build/config index cf28bca16..eb5d139b7 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1171,13 +1171,6 @@ LB_INTERACTIVE="${LB_INTERACTIVE}" # \$LB_KEYRING_PACKAGES: set keyring packages LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES}" -# \$LB_LINUX_FLAVOURS: set kernel flavour to use -# This is kept for backwards compatibility -if [ -n "${LB_LINUX_FLAVOURS}" ] -then - LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS}" -fi - # \$LB_LINUX_FLAVOURS_WITH_ARCH: set kernel flavour to use (with arch) LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH}" |