Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add zstd on windows #387

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Add zstd on windows #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa36f71
windows: add zstandard package
Luap99 Oct 10, 2024
ef2c8f2
Build new images
Luap99 Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IMG_SFX
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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