Skip to content

builder-source-archive: Switch to bsdunzip #650

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
libjson-glib-dev shared-mime-info desktop-file-utils libpolkit-agent-1-dev libpolkit-gobject-1-dev \
libseccomp-dev libsystemd-dev libxml2-utils libgpgme11-dev gobject-introspection \
libgirepository1.0-dev libappstream-dev libdconf-dev clang socat flatpak \
libcurl4-gnutls-dev libflatpak-dev libyaml-dev elfutils git patch unzip
libcurl4-gnutls-dev libflatpak-dev libyaml-dev elfutils git patch libarchive-tools
- name: Check out flatpak
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
libjson-glib-dev shared-mime-info desktop-file-utils libpolkit-agent-1-dev libpolkit-gobject-1-dev \
libseccomp-dev libsystemd-dev libxml2-utils libgpgme11-dev gobject-introspection \
libgirepository1.0-dev libappstream-dev libdconf-dev clang flatpak \
libcurl4-gnutls-dev libflatpak-dev libyaml-dev elfutils git patch unzip
libcurl4-gnutls-dev libflatpak-dev libyaml-dev elfutils git patch libarchive-tools
- name: Check out flatpak
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
patch \
shared-mime-info \
socat \
unzip
libarchive-tools

- name: Check out flatpak-builder
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Very commonly used:
* cp
* git
* 7z
* unzip
* bsdunzip (libarchive)

Rarely used:

Expand Down
2 changes: 1 addition & 1 deletion ci/libbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pkg_install_builddeps() {
else
yum -y install yum-utils
# Base buildroot, copied from the mock config sadly
yum -y install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz
yum -y install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar libarchive-tools util-linux which xz
fi
# builddeps+runtime deps
pkg_builddep $pkg
Expand Down
2 changes: 1 addition & 1 deletion src/builder-source-archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ unzip (GFile *dir,
GError **error)
{
gboolean res;
const char *argv[] = { "unzip", "-q", zip_path, NULL };
const char *argv[] = { "bsdunzip", "-q", zip_path, NULL };

res = flatpak_spawnv (dir, NULL, 0, error, argv, NULL);

Expand Down