From f9ed8316bc194676b9b1e502c705eebb816e33a0 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 11 Jan 2025 17:52:56 -0600 Subject: [PATCH] remove build-fix since not needed with dnf5 --- build_files/base/01-build-fix.sh | 32 -------------------------------- build_files/shared/build-base.sh | 3 --- 2 files changed, 35 deletions(-) delete mode 100755 build_files/base/01-build-fix.sh diff --git a/build_files/base/01-build-fix.sh b/build_files/base/01-build-fix.sh deleted file mode 100755 index d34359b5266..00000000000 --- a/build_files/base/01-build-fix.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/bash - -echo "::group:: ===$(basename "$0")===" - -set -eoux pipefail - -# This script provides fixes to packages known to have caused build skew. -# It works by force replacing packages on the FROM image with current -# packages from fedora update repos. - -repos=( - fedora-updates.repo - fedora-updates-archive.repo -) - -for repo in "${repos[@]}"; do - if [[ "$(grep -c "enabled=1" /etc/yum.repos.d/"${repo}")" -eq 0 ]]; then - sed -i "0,/enabled=0/{s/enabled=0/enabled=1/}" /etc/yum.repos.d/"${repo}" - fi -done - -dnf5 -y upgrade \ - --repo=updates \ - elfutils-libelf \ - elfutils-libs \ - || true - -rpm-ostree override remove \ - glibc32 \ - || true - -echo "::endgroup::" diff --git a/build_files/shared/build-base.sh b/build_files/shared/build-base.sh index d217dbec24b..ebbc2231f16 100755 --- a/build_files/shared/build-base.sh +++ b/build_files/shared/build-base.sh @@ -38,9 +38,6 @@ echo "::endgroup::" # Generate image-info.json /ctx/build_files/base/00-image-info.sh -# Build Fix - Fix known skew offenders -/ctx/build_files/base/01-build-fix.sh - # Get COPR Repos /ctx/build_files/base/02-install-copr-repos.sh