Remove Ubuntu Groovy from codebase (#2952)

This commit is contained in:
Igor Pečovnik
2021-07-03 21:58:08 +02:00
committed by GitHub
parent b2e98daf7b
commit 1f2e97febf
5 changed files with 10 additions and 13 deletions

View File

@@ -36,7 +36,6 @@ create_chroot()
apt_mirror['xenial']="$UBUNTU_MIRROR"
apt_mirror['bionic']="$UBUNTU_MIRROR"
apt_mirror['focal']="$UBUNTU_MIRROR"
apt_mirror['groovy']="$UBUNTU_MIRROR"
apt_mirror['hirsute']="$UBUNTU_MIRROR"
components['stretch']='main,contrib'
components['buster']='main,contrib'
@@ -45,12 +44,11 @@ create_chroot()
components['xenial']='main,universe,multiverse'
components['bionic']='main,universe,multiverse'
components['focal']='main,universe,multiverse'
components['groovy']='main,universe,multiverse'
components['hirsute']='main,universe,multiverse'
display_alert "Creating build chroot" "$release/$arch" "info"
local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc"
# perhaps a temporally workaround
[[ $release == buster || $release == bullseye || $release == focal || $release == groovy || $release == hirsute || $release == sid ]] && includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl"
[[ $release == buster || $release == bullseye || $release == focal || $release == hirsute || $release == sid ]] && includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl"
if [[ $NO_APT_CACHER != yes ]]; then
local mirror_addr="http://localhost:3142/${apt_mirror[${release}]}"
else
@@ -85,7 +83,7 @@ create_chroot()
mkdir -p "${target_dir}"/var/lock
fi
chroot "${target_dir}" /bin/bash -c "/usr/sbin/update-ccache-symlinks"
[[ $release == bullseye || $release == focal || $release == groovy || $release == hirsute || $release == sid ]] && chroot "${target_dir}" /bin/bash -c "ln -s /usr/bin/python3 /usr/bin/python"
[[ $release == bullseye || $release == focal || $release == hirsute || $release == sid ]] && chroot "${target_dir}" /bin/bash -c "ln -s /usr/bin/python3 /usr/bin/python"
touch "${target_dir}"/root/.debootstrap-complete
display_alert "Debootstrap complete" "${release}/${arch}" "info"
} #############################################################################
@@ -105,7 +103,6 @@ chroot_prepare_distccd()
gcc_version['xenial']='5.4'
gcc_version['bionic']='5.4'
gcc_version['focal']='9.2'
gcc_version['groovy']='10.2'
gcc_version['hirsute']='10.2'
gcc_version['sid']='10.2'
gcc_type['armhf']='arm-linux-gnueabihf-'
@@ -141,7 +138,7 @@ chroot_build_packages()
target_arch="${ARCH}"
else
# only make packages for recent releases. There are no changes on older
target_release="stretch bionic buster bullseye groovy focal hirsute sid"
target_release="stretch bionic buster bullseye focal hirsute sid"
target_arch="armhf arm64"
fi

View File

@@ -358,7 +358,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|groovy|hirsute)$ ]]; then
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute)$ ]]; then
DISTRIBUTION="Ubuntu"
else
DISTRIBUTION="Debian"

View File

@@ -421,7 +421,7 @@ prepare_partitions()
# add -N number of inodes to keep mount from running out
# create bigger number for desktop builds
if [[ $BUILD_DESKTOP == yes ]]; then local node_number=4096; else local node_number=1024; fi
if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|groovy|focal|hirsute|sid ]]; then
if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|sid ]]; then
mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum -N $((128*${node_number}))"
elif [[ $HOSTRELEASE == xenial ]]; then
mkopts[ext4]="-q -m 2 -N $((128*${node_number}))"

View File

@@ -606,7 +606,7 @@ install_distribution_specific()
sed '/security/ d' -i "${SDCARD}"/etc/apt/sources.list
;;
bionic|groovy|focal|hirsute)
bionic|focal|hirsute)
# by using default lz4 initrd compression leads to corruption, go back to proven method
sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf

View File

@@ -143,7 +143,7 @@ get_package_list_hash()
# create_sources_list <release> <basedir>
#
# <release>: stretch|buster|bullseye|xenial|bionic|groovy|focal|groovy|hirsute|sid
# <release>: buster|bullseye|bionic|focal|hirsute|sid
# <basedir>: path to root directory
#
create_sources_list()
@@ -1054,7 +1054,7 @@ prepare_host()
fi
# Add support for Ubuntu 20.04, 21.04 and Mint Ulyana
if [[ $HOSTRELEASE =~ ^(focal|groovy|hirsute|ulyana|ulyssa|bullseye)$ ]]; then
if [[ $HOSTRELEASE =~ ^(focal|hirsute|ulyana|ulyssa|bullseye)$ ]]; then
hostdeps+=" python2 python3"
ln -fs /usr/bin/python2.7 /usr/bin/python2
ln -fs /usr/bin/python2.7 /usr/bin/python
@@ -1069,7 +1069,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 discussion
if [[ -z $HOSTRELEASE || "buster bullseye groovy focal hirsute debbie tricia ulyana ulyssa" != *"$HOSTRELEASE"* ]]; then
if [[ -z $HOSTRELEASE || "buster bullseye focal hirsute debbie tricia ulyana ulyssa" != *"$HOSTRELEASE"* ]]; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
@@ -1085,7 +1085,7 @@ prepare_host()
# build aarch64
if [[ $(dpkg --print-architecture) == amd64 ]]; then
if [[ -z $HOSTRELEASE || $HOSTRELEASE =~ ^(focal|groovy|debbie|buster|bullseye|hirsute|ulyana|ulyssa)$ ]]; then
if [[ -z $HOSTRELEASE || $HOSTRELEASE =~ ^(focal|debbie|buster|bullseye|hirsute|ulyana|ulyssa)$ ]]; then
hostdeps="${hostdeps/lib32ncurses5 lib32tinfo5/lib32ncurses6 lib32tinfo6}"
fi