Skip to content

Commit

Permalink
New VM build, just to see how things are
Browse files Browse the repository at this point in the history
New pasta (03-20). And whatever else comes in.

Also: install StrawberryPerl on Windows, see:

  containers/podman#21991

First CI-detected problem:

    debian: The following packages have unmet dependencies:
    debian:  libfuse2t64 : Breaks: libfuse2 (< 2.9.9-8.1)

Solution attempted: remove libfuse2 from INSTALL_PACKAGES

And, bump expired Debian timebombs

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed Mar 20, 2024
1 parent a3e4099 commit c41f36a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 18 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240308t191852z-f39f38d13
20240320t153921z-f39f38d13
6 changes: 3 additions & 3 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"
#
# FIXME: 2024-01-02: Bumped the timebomb expiration date because it's
# too hard to find out if it's fixed or not
# 2024-01-25: again, and 02-26 again
timebomb 20240320 "workaround for updating debian 12 to 13"
# 2024-01-25: again, and 02-26 again and 03-20 again
timebomb 20240330 "workaround for updating debian 12 to 13"
$SUDO tee /usr/bin/version_find_latest <<"EOF"
#!/bin/bash
#
Expand Down Expand Up @@ -147,7 +147,7 @@ $SUDO chmod 755 /usr/bin/version_find_latest
# 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
timebomb 20240320 "prevent us from getting broken tar-1.35+dfsg-3"
timebomb 20240330 "prevent us from getting broken tar-1.35+dfsg-3"
( set -x; $SUDO apt-mark hold tar; )

echo "Upgrading to SID"
Expand Down
1 change: 0 additions & 1 deletion cache_images/debian_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ INSTALL_PACKAGES=(\
libdevmapper-dev
libdevmapper1.02.1
libfuse-dev
libfuse2
libfuse3-dev
libglib2.0-dev
libgpgme11-dev
Expand Down
20 changes: 8 additions & 12 deletions cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,16 @@ DOWNLOAD_PACKAGES=(\
msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"

# 2024-02-20 package needed for podman #21563
# 2024-02-26 stable everywhere except fc38
timebomb 20240310 "package not yet in stable for fc38"
if [[ "$OS_RELEASE_VER" -eq 38 ]]; then
# 2024-03-18 new pasta, built today, not yet stable anywhere
timebomb 20240325 "package not yet in stable for fc38"
if [[ "$OS_RELEASE_VER" -le 41 ]]; then
arch=$(uname -m)
n=passt
v=0%5E20240320.g71dd405
r=1.fc$OS_RELEASE_VER
bigto $SUDO dnf install -y \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/$arch/passt-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.$arch.rpm \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/noarch/passt-selinux-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.noarch.rpm
fi

timebomb 20240310 "ARGH! Stupid rc6 kernel still not stable, force it"
if [[ "$OS_RELEASE_VER" -eq 41 ]]; then
bigto $SUDO dnf install -y \
https://kojipkgs.fedoraproject.org//packages/kernel/6.8.0/0.rc6.49.fc41/x86_64/kernel{,-core,-modules,-modules-core}-6.8.0-0.rc6.49.fc41.x86_64.rpm
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-$v-$r.$arch.rpm \
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/noarch/$n-selinux-$v-$r.noarch.rpm
fi

msg "Downloading packages for optional installation at runtime, as needed."
Expand Down
2 changes: 1 addition & 1 deletion win_images/win_packaging.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocola

# Install basic required tooling.
# psexec needed to workaround session 0 WSL bug
retryInstall git archiver psexec golang mingw; Check-Exit
retryInstall git archiver psexec golang mingw StrawberryPerl; Check-Exit

# Update service is required for dotnet
Set-Service -Name wuauserv -StartupType "Manual"; Check-Exit
Expand Down

0 comments on commit c41f36a

Please sign in to comment.