Skip to content

Commit e5a1016

Browse files
committed
new images
Removed two timebombs that no longer apply, composefs is installed in the main package list and the pasta version is in stable now. Signed-off-by: Paul Holzinger <[email protected]>
1 parent 8c6d4bb commit e5a1016

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

IMG_SFX

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20241218t154721z-f41f40d13
1+
20250107t132430z-f41f40d13

cache_images/fedora_packaging.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,6 @@ DOWNLOAD_PACKAGES=(\
211211
msg "Installing general build/test dependencies"
212212
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
213213

214-
# 2024-12-11 not yet stable on f42
215-
timebomb 20250101 "pasta 2024_12_11.g09478d5 required fix pasta/glibc regression https://github.com/containers/podman/issues/24804"
216-
if [[ "$OS_RELEASE_VER" -eq 42 ]]; then
217-
arch=$(uname -m)
218-
n=passt
219-
v=0%5E20241211.g09478d5
220-
r=1.fc$OS_RELEASE_VER
221-
bigto $SUDO dnf install -y \
222-
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-$v-$r.$arch.rpm \
223-
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/noarch/$n-selinux-$v-$r.noarch.rpm
224-
fi
225-
226214
msg "Downloading packages for optional installation at runtime, as needed."
227215
$SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
228216
cd "$PACKAGE_DOWNLOAD_DIR"

cache_images/rawhide_setup.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ $SUDO sed -i -r -e 's/^gpgcheck=.+/gpgcheck=0/' /etc/yum.repos.d/*.repo
3030
$SUDO dnf5 -y distro-sync --releasever=rawhide --allowerasing
3131
$SUDO dnf5 upgrade -y
3232

33-
# As of May 2024 composefs is heating up
34-
timebomb 20241231 "At some point, composefs should be available on all fedoras"
35-
$SUDO dnf5 -y install composefs
36-
3733
# A shared fedora_packaging.sh script is called next that doesn't always support dnf5
3834
$SUDO ln -s $(type -P dnf5) /usr/local/bin/dnf
3935

0 commit comments

Comments
 (0)