From e66963397a7d18289678f6106a5929ed75d92f26 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 5 Nov 2024 18:51:40 +0100 Subject: [PATCH] Fix ratt (rebuild-all-the-things) Debian job (#1195) * Use the new debian.sources in Sid * All supported debian versions are now using greater gcc than 8 Signed-off-by: Jose Luis Rivero --------- Signed-off-by: Jose Luis Rivero --- .../docker/lib/docker_generate_dockerfile.bash | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index 3778abb29..2dba8ef21 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -177,8 +177,8 @@ fi # The redirection fails too many times using us ftp if [[ ${LINUX_DISTRO} == 'debian' ]]; then cat >> Dockerfile << DELIM_DEBIAN_APT - RUN sed -i -e 's:httpredir:ftp.us:g' /etc/apt/sources.list - RUN echo "deb-src ${SOURCE_LIST_URL} ${DISTRO} main" >> /etc/apt/sources.list + RUN sed -i -e 's/URIs: .*/URIs: http:\/\/ftp.us.debian.org\/debian/g' /etc/apt/sources.list.d/debian.sources + RUN sed -i -e 's/Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources DELIM_DEBIAN_APT fi @@ -334,17 +334,6 @@ RUN (apt-get update || (rm -rf /var/lib/apt/lists/* && apt-get update)) \ RUN mkdir -p ${WORKSPACE} DELIM_DOCKER31 -# Beware of moving this code since it needs to run update-alternative after -# installing the default compiler in PACKAGES_CACHE_AND_CHECK_UPDATES -if ${INSTALL_C17_COMPILER}; then -cat >> Dockerfile << DELIM_GCC8 - RUN apt-get update \\ - && apt-get install -y g++-8 \\ - && rm -rf /var/lib/apt/lists/* \\ - && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8 -DELIM_GCC8 -fi - if ${USE_SQUID}; then cat >> Dockerfile << DELIM_DOCKER_SQUID # If host is running squid-deb-proxy on port 8000, populate /etc/apt/apt.conf.d/30proxy