Skip to content

Commit

Permalink
Merge pull request #387 from Luap99/win-zstd
Browse files Browse the repository at this point in the history
Add zstd on windows
  • Loading branch information
edsantiago authored Oct 10, 2024
2 parents 456905c + ef2c8f2 commit d8ee5ce
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240911t151000z-f40f39d13
20241010t105554z-f40f39d13
2 changes: 1 addition & 1 deletion base_images/debian_base-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ source "$REPO_DIRPATH/lib.sh"
# 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 20241001 "prevent us from getting broken tar-1.35+dfsg-3"
timebomb 20241201 "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
18 changes: 0 additions & 18 deletions cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,6 @@ DOWNLOAD_PACKAGES=(\
msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"

# 2024-09-11 early testing of crun 1.17
timebomb 20240930 "crun 1.17 should be stable by now"
arch=$(uname -m)
n=crun
v=1.17
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 \
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-wasm-$v-$r.$arch.rpm

msg "Downloading packages for optional installation at runtime, as needed."
$SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
cd "$PACKAGE_DOWNLOAD_DIR"
Expand All @@ -224,11 +214,3 @@ cd -
# Occasionally following an install, there are more updates available.
# This may be due to activation of suggested/recommended dependency resolution.
lilto $SUDO dnf update -y

# Gah. FIXME 2024-06-20: rawhide now includes rpm-plugin-ima,
# which causes rootless podman pods to fail.
# https://github.com/containers/podman/issues/18543
if ! ((CONTAINER)); then
timebomb 20241001 "Temporary workaround for signed rpms (ima) in rawhide"
$SUDO setfattr -x security.ima /usr/libexec/catatonit/catatonit || true
fi
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 StrawberryPerl; Check-Exit
retryInstall git archiver psexec golang mingw StrawberryPerl zstandard; Check-Exit

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

0 comments on commit d8ee5ce

Please sign in to comment.