From 4713ab23b982c78b4979957b51995ceb79455c97 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 22 Feb 2021 11:56:48 +0000 Subject: [PATCH] Internal - Add support for Hirsute build host We need this at least for building more recent (test) targets --- lib/general.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/general.sh b/lib/general.sh index 8ec56198a..d932513af 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -976,8 +976,8 @@ prepare_host() local codename=$(lsb_release -sc) - # Getting ready for Ubuntu 20.04 - if [[ $codename == focal || $codename == groovy || $codename == ulyana ]]; then + # Add support for Ubuntu 20.04, 21.04 and Mint Ulyana + if [[ $codename =~ ^(focal|groovy|hirsute|ulyana)$ ]]; then hostdeps+=" python2 python3" ln -fs /usr/bin/python2.7 /usr/bin/python2 ln -fs /usr/bin/python2.7 /usr/bin/python @@ -993,7 +993,7 @@ prepare_host() # # NO_HOST_RELEASE_CHECK overrides the check for a supported host system # Disable host OS check at your own risk, any issues reported with unsupported releases will be closed without a discussion - if [[ -z $codename || "buster groovy focal debbie tricia ulyana" != *"$codename"* ]]; then + if [[ -z $codename || "buster groovy focal hirsute debbie tricia ulyana" != *"$codename"* ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then display_alert "You are running on an unsupported system" "${codename:-(unknown)}" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn" @@ -1006,7 +1006,8 @@ prepare_host() exit_with_error "Windows subsystem for Linux is not a supported build environment" fi - if [[ -z $codename || "focal" == "$codename" || "groovy" == "$codename" || "debbie" == "$codename" || "buster" == "$codename" || "ulyana" == "$codename" ]]; then + + if [[ -z $codename || $codename =~ ^(focal|groovy|debbie|buster|hirsute|ulyana)$ ]]; then hostdeps="${hostdeps/lib32ncurses5 lib32tinfo5/lib32ncurses6 lib32tinfo6}" fi