Skip to content

Commit 46d7311

Browse files
authored
Remove Focal (#31)
* Remove Focal
1 parent fa2e632 commit 46d7311

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

setup_sbuild.sh

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ else
1616
disttype="debian"
1717
fi
1818

19-
if [ "$dist" = "focal" ]; then
20-
ubuntu_ports="/ubuntu-ports"
21-
fi
2219
# Determine base apt repository URL based on type of distribution and architecture.
2320
case "$disttype" in
2421
ubuntu)
@@ -90,23 +87,8 @@ fi
9087
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get update
9188
schroot -c source:${dist}-${arch}-sbuild -d / -- apt-get install -y build-essential python3 python3-pip python3-venv python3-dev g++ clang
9289

93-
if [ "$dist" = "focal" ]; then
94-
# Install gcc-10 and g++-10 which are required in case of Ubuntu Focal to support Ranges library, introduced in C++20
95-
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -c "apt update && apt remove -y gcc-9 g++-9 gcc-9-base && apt upgrade -yqq && apt install -y gcc build-essential gcc-10 g++-10 clang-format clang lcov openssl"
96-
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -c "[ -f /usr/bin/gcc-10 ] && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10|| echo 'gcc-10 installation failed'"
97-
98-
# Install newer version of debhelper
99-
# Required because of a bug: https://bugs-devel.debian.org/cgi-bin/bugreport.cgi?bug=959731
100-
INSTALL_DEBHELPER_FROM_BULLSEYE="apt install -y wget \
101-
&& wget http://ftp.de.debian.org/debian/pool/main/d/debhelper/libdebhelper-perl_13.3.4_all.deb \
102-
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_13.3.4_all.deb \
103-
&& dpkg -i libdebhelper-perl_13.3.4_all.deb debhelper_13.3.4_all.deb \
104-
|| apt-get -yf install"
105-
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -c "$INSTALL_DEBHELPER_FROM_BULLSEYE"
106-
fi
107-
108-
# Install latest CMake version for Focal, Jammy and Bullseye
109-
if [ "$dist" = "focal" ] || [ "$dist" = "jammy" ] || [ "$dist" = "bullseye" ]; then
90+
# Install latest CMake version for Jammy and Bullseye
91+
if [ "$dist" = "jammy" ] || [ "$dist" = "bullseye" ]; then
11092
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -c "apt install -y python3-pip && \
11193
python3 -m pip install --upgrade pip && \
11294
python3 -m pip install cmake==3.31.6 && \

0 commit comments

Comments
 (0)