Skip to content

Commit

Permalink
Merge pull request #396 from Luap99/podman-machine-os
Browse files Browse the repository at this point in the history
add packages needed by podman-machine-os
  • Loading branch information
Luap99 authored Dec 13, 2024
2 parents 99e2092 + d317246 commit 46c3bf5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20241118t130000z-f41f40d13
20241212t122344z-f41f40d13
4 changes: 2 additions & 2 deletions base_images/debian_base-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ source "$REPO_DIRPATH/lib.sh"
# https://github.com/containers/podman/issues/19407
# https://bugzilla.redhat.com/show_bug.cgi?id=2230127
# 2024-01-25 dfsg-3 also has the bug
# 2024-09-06 trixy still has 1.35+dfsg-3 (https://packages.debian.org/trixie/tar)
timebomb 20241201 "prevent us from getting broken tar-1.35+dfsg-3"
# 2024-12-04 trixy still has 1.35+dfsg-3 (https://packages.debian.org/trixie/tar)
timebomb 20250201 "prevent us from getting broken tar-1.35+dfsg-3"
$SUDO tee /etc/apt/preferences.d/$(date +%Y%m%d)-tar <<EOF
Package: tar
Pin: version 1.35+dfsg-[23]
Expand Down
19 changes: 15 additions & 4 deletions cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ INSTALL_PACKAGES=(\
pigz
pkgconfig
podman
podman-remote
pre-commit
procps-ng
protobuf
Expand Down Expand Up @@ -183,6 +184,16 @@ if ! ((CONTAINER)); then
selinux-policy-devel
policycoreutils
)

# Extra packages needed by podman-machine-os
INSTALL_PACKAGES+=( \
podman-machine
osbuild
osbuild-tools
osbuild-ostree
xfsprogs
e2fsprogs
)
fi


Expand All @@ -200,12 +211,12 @@ DOWNLOAD_PACKAGES=(\
msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"

# 2024-11-07 not yet stable on f40
timebomb 20241119 "pasta 20241030 desired for podman flake fix"
if [[ "$OS_RELEASE_VER" -eq 40 ]]; then
# 2024-12-11 not yet stable on f42
timebomb 20250101 "pasta 2024_12_11.g09478d5 required fix pasta/glibc regression https://github.com/containers/podman/issues/24804"
if [[ "$OS_RELEASE_VER" -eq 42 ]]; then
arch=$(uname -m)
n=passt
v=0%5E20241030.gee7d0b6
v=0%5E20241211.g09478d5
r=1.fc$OS_RELEASE_VER
bigto $SUDO dnf install -y \
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-$v-$r.$arch.rpm \
Expand Down

0 comments on commit 46c3bf5

Please sign in to comment.