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

Jump to bottom

libsolv: enable zstd support to match createrepo_c #10345

Merged
merged 2 commits into from
Oct 4, 2024
Merged

libsolv: enable zstd support to match createrepo_c #10345

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
55d8843
Add zstd support to libsolv
reubeno Sep 4, 2024
cfd2be2
Update toolchain build script
reubeno Sep 4, 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
9 changes: 7 additions & 2 deletions SPECS/libsolv/libsolv.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: A free package dependency solver
Name: libsolv
Version: 0.7.28
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD
URL: https://github.com/openSUSE/libsolv
Source0: https://github.com/openSUSE/libsolv/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Expand All @@ -10,6 +10,7 @@ Vendor: Microsoft Corporation
Distribution: Azure Linux
BuildRequires: cmake
BuildRequires: rpm-devel
BuildRequires: zstd-devel
Requires: expat-libs

%description
Expand Down Expand Up @@ -47,7 +48,8 @@ Requires: xz
-DENABLE_RPMDB_BYRPMHEADER=ON \
-DENABLE_RPMDB_LIBRPM=ON \
-DENABLE_RPMMD=ON \
-DENABLE_COMPS=ON
-DENABLE_COMPS=ON \
-DENABLE_ZSTD_COMPRESSION=ON
%make_build

%install
Expand Down Expand Up @@ -77,6 +79,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_mandir}/man1/*

%changelog
* Wed Sep 04 2024 Reuben Olinsky <[email protected]> - 0.7.28-2
- Enable zstd support to match createrepo_c.

* Wed Feb 07 2024 Alberto David Perez Guevara <[email protected]> - 0.7.28-1
- Upgrade to version 0.7.28

Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ rpm-libs-4.18.2-1.azl3.aarch64.rpm
cpio-2.14-1.azl3.aarch64.rpm
cpio-lang-2.14-1.azl3.aarch64.rpm
e2fsprogs-libs-1.47.0-2.azl3.aarch64.rpm
libsolv-0.7.28-1.azl3.aarch64.rpm
libsolv-devel-0.7.28-1.azl3.aarch64.rpm
libsolv-0.7.28-2.azl3.aarch64.rpm
libsolv-devel-0.7.28-2.azl3.aarch64.rpm
libssh2-1.11.0-1.azl3.aarch64.rpm
libssh2-devel-1.11.0-1.azl3.aarch64.rpm
krb5-1.21.3-2.azl3.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ rpm-libs-4.18.2-1.azl3.x86_64.rpm
cpio-2.14-1.azl3.x86_64.rpm
cpio-lang-2.14-1.azl3.x86_64.rpm
e2fsprogs-libs-1.47.0-2.azl3.x86_64.rpm
libsolv-0.7.28-1.azl3.x86_64.rpm
libsolv-devel-0.7.28-1.azl3.x86_64.rpm
libsolv-0.7.28-2.azl3.x86_64.rpm
libsolv-devel-0.7.28-2.azl3.x86_64.rpm
libssh2-1.11.0-1.azl3.x86_64.rpm
libssh2-devel-1.11.0-1.azl3.x86_64.rpm
krb5-1.21.3-2.azl3.x86_64.rpm
Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ libselinux-utils-3.6-3.azl3.aarch64.rpm
libsepol-3.6-1.azl3.aarch64.rpm
libsepol-debuginfo-3.6-1.azl3.aarch64.rpm
libsepol-devel-3.6-1.azl3.aarch64.rpm
libsolv-0.7.28-1.azl3.aarch64.rpm
libsolv-debuginfo-0.7.28-1.azl3.aarch64.rpm
libsolv-devel-0.7.28-1.azl3.aarch64.rpm
libsolv-tools-0.7.28-1.azl3.aarch64.rpm
libsolv-0.7.28-2.azl3.aarch64.rpm
libsolv-debuginfo-0.7.28-2.azl3.aarch64.rpm
libsolv-devel-0.7.28-2.azl3.aarch64.rpm
libsolv-tools-0.7.28-2.azl3.aarch64.rpm
libssh2-1.11.0-1.azl3.aarch64.rpm
libssh2-debuginfo-1.11.0-1.azl3.aarch64.rpm
libssh2-devel-1.11.0-1.azl3.aarch64.rpm
Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ libselinux-utils-3.6-3.azl3.x86_64.rpm
libsepol-3.6-1.azl3.x86_64.rpm
libsepol-debuginfo-3.6-1.azl3.x86_64.rpm
libsepol-devel-3.6-1.azl3.x86_64.rpm
libsolv-0.7.28-1.azl3.x86_64.rpm
libsolv-debuginfo-0.7.28-1.azl3.x86_64.rpm
libsolv-devel-0.7.28-1.azl3.x86_64.rpm
libsolv-tools-0.7.28-1.azl3.x86_64.rpm
libsolv-0.7.28-2.azl3.x86_64.rpm
libsolv-debuginfo-0.7.28-2.azl3.x86_64.rpm
libsolv-devel-0.7.28-2.azl3.x86_64.rpm
libsolv-tools-0.7.28-2.azl3.x86_64.rpm
libssh2-1.11.0-1.azl3.x86_64.rpm
libssh2-debuginfo-1.11.0-1.azl3.x86_64.rpm
libssh2-devel-1.11.0-1.azl3.x86_64.rpm
Expand Down
3 changes: 2 additions & 1 deletion toolkit/scripts/toolchain/build_official_toolchain_rpms.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,9 @@ build_rpm_in_chroot_no_install libxslt
chroot_and_install_rpms pam
build_rpm_in_chroot_no_install docbook-style-xsl

# libsolv needs cmake
# libsolv needs cmake, zstd-devel
chroot_and_install_rpms cmake
chroot_and_install_rpms zstd
build_rpm_in_chroot_no_install libsolv

# ccache needs cmake
Expand Down
Loading