diff --git a/IMG_SFX b/IMG_SFX index 242d8ac2..3cb9abcc 100644 --- a/IMG_SFX +++ b/IMG_SFX @@ -1 +1 @@ -20240125t184057z-f39f38d13 +20240130t133129z-f39f38d13 diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh index 378013b7..024edc67 100644 --- a/cache_images/fedora_packaging.sh +++ b/cache_images/fedora_packaging.sh @@ -37,7 +37,11 @@ msg "Updating/Installing repos and packages for $OS_REL_VER" bigto ooe.sh $SUDO dnf update -y +# netavark crisis of 2024-01-27 weekend +timebomb 20240210 "Please remove aardvark-dns from INSTALL_PACKAGES; netavark should Require it" + INSTALL_PACKAGES=(\ + aardvark-dns autoconf automake bash-completion @@ -140,13 +144,7 @@ INSTALL_PACKAGES=(\ zstd ) -# Test with CNI in Fedora N-1 -EXARG="" -if [[ "$PACKER_BUILD_NAME" =~ prior ]]; then - EXARG="--exclude=netavark --exclude=aardvark-dns" -fi - -# Rawhide images don't need these pacakges +# Rawhide images don't need these packages if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then INSTALL_PACKAGES+=( \ docker-compose @@ -173,13 +171,6 @@ if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then ) fi -# Workarond: Around the time of this commit, the `criu` package -# was found to be missing a recommends-dependency on criu-libs. -# Until a fixed rpm lands in the Fedora repositories, manually -# include it here. This workaround should be removed once the -# package is corrected (likely > 3.17.1-3). -INSTALL_PACKAGES+=(criu-libs) - # When installing during a container-build, having this present # will seriously screw up future dnf operations in very non-obvious ways. if ! ((CONTAINER)); then @@ -205,7 +196,7 @@ DOWNLOAD_PACKAGES=(\ ) msg "Installing general build/test dependencies" -bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}" +bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}" msg "Downloading packages for optional installation at runtime, as needed." $SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"