Skip to content

Commit ec91650

Browse files
authored
libsolv: enable zstd support to match createrepo_c (#10345)
This removes the need to use createrepo_c with --compatibility for Azure Linux 3.0.
1 parent 2625d7b commit ec91650

6 files changed

Lines changed: 21 additions & 15 deletions

File tree

SPECS/libsolv/libsolv.spec

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: A free package dependency solver
22
Name: libsolv
33
Version: 0.7.28
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: BSD
66
URL: https://github.com/openSUSE/libsolv
77
Source0: https://github.com/openSUSE/libsolv/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Vendor: Microsoft Corporation
1010
Distribution: Azure Linux
1111
BuildRequires: cmake
1212
BuildRequires: rpm-devel
13+
BuildRequires: zstd-devel
1314
Requires: expat-libs
1415

1516
%description
@@ -47,7 +48,8 @@ Requires: xz
4748
-DENABLE_RPMDB_BYRPMHEADER=ON \
4849
-DENABLE_RPMDB_LIBRPM=ON \
4950
-DENABLE_RPMMD=ON \
50-
-DENABLE_COMPS=ON
51+
-DENABLE_COMPS=ON \
52+
-DENABLE_ZSTD_COMPRESSION=ON
5153
%make_build
5254

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

7981
%changelog
82+
* Wed Sep 04 2024 Reuben Olinsky <reubeno@microsoft.com> - 0.7.28-2
83+
- Enable zstd support to match createrepo_c.
84+
8085
* Wed Feb 07 2024 Alberto David Perez Guevara <aperezguevar@microsoft.com> - 0.7.28-1
8186
- Upgrade to version 0.7.28
8287

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ rpm-libs-4.18.2-1.azl3.aarch64.rpm
189189
cpio-2.14-1.azl3.aarch64.rpm
190190
cpio-lang-2.14-1.azl3.aarch64.rpm
191191
e2fsprogs-libs-1.47.0-2.azl3.aarch64.rpm
192-
libsolv-0.7.28-1.azl3.aarch64.rpm
193-
libsolv-devel-0.7.28-1.azl3.aarch64.rpm
192+
libsolv-0.7.28-2.azl3.aarch64.rpm
193+
libsolv-devel-0.7.28-2.azl3.aarch64.rpm
194194
libssh2-1.11.0-1.azl3.aarch64.rpm
195195
libssh2-devel-1.11.0-1.azl3.aarch64.rpm
196196
krb5-1.21.3-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ rpm-libs-4.18.2-1.azl3.x86_64.rpm
189189
cpio-2.14-1.azl3.x86_64.rpm
190190
cpio-lang-2.14-1.azl3.x86_64.rpm
191191
e2fsprogs-libs-1.47.0-2.azl3.x86_64.rpm
192-
libsolv-0.7.28-1.azl3.x86_64.rpm
193-
libsolv-devel-0.7.28-1.azl3.x86_64.rpm
192+
libsolv-0.7.28-2.azl3.x86_64.rpm
193+
libsolv-devel-0.7.28-2.azl3.x86_64.rpm
194194
libssh2-1.11.0-1.azl3.x86_64.rpm
195195
libssh2-devel-1.11.0-1.azl3.x86_64.rpm
196196
krb5-1.21.3-2.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ libselinux-utils-3.6-3.azl3.aarch64.rpm
223223
libsepol-3.6-1.azl3.aarch64.rpm
224224
libsepol-debuginfo-3.6-1.azl3.aarch64.rpm
225225
libsepol-devel-3.6-1.azl3.aarch64.rpm
226-
libsolv-0.7.28-1.azl3.aarch64.rpm
227-
libsolv-debuginfo-0.7.28-1.azl3.aarch64.rpm
228-
libsolv-devel-0.7.28-1.azl3.aarch64.rpm
229-
libsolv-tools-0.7.28-1.azl3.aarch64.rpm
226+
libsolv-0.7.28-2.azl3.aarch64.rpm
227+
libsolv-debuginfo-0.7.28-2.azl3.aarch64.rpm
228+
libsolv-devel-0.7.28-2.azl3.aarch64.rpm
229+
libsolv-tools-0.7.28-2.azl3.aarch64.rpm
230230
libssh2-1.11.0-1.azl3.aarch64.rpm
231231
libssh2-debuginfo-1.11.0-1.azl3.aarch64.rpm
232232
libssh2-devel-1.11.0-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ libselinux-utils-3.6-3.azl3.x86_64.rpm
229229
libsepol-3.6-1.azl3.x86_64.rpm
230230
libsepol-debuginfo-3.6-1.azl3.x86_64.rpm
231231
libsepol-devel-3.6-1.azl3.x86_64.rpm
232-
libsolv-0.7.28-1.azl3.x86_64.rpm
233-
libsolv-debuginfo-0.7.28-1.azl3.x86_64.rpm
234-
libsolv-devel-0.7.28-1.azl3.x86_64.rpm
235-
libsolv-tools-0.7.28-1.azl3.x86_64.rpm
232+
libsolv-0.7.28-2.azl3.x86_64.rpm
233+
libsolv-debuginfo-0.7.28-2.azl3.x86_64.rpm
234+
libsolv-devel-0.7.28-2.azl3.x86_64.rpm
235+
libsolv-tools-0.7.28-2.azl3.x86_64.rpm
236236
libssh2-1.11.0-1.azl3.x86_64.rpm
237237
libssh2-debuginfo-1.11.0-1.azl3.x86_64.rpm
238238
libssh2-devel-1.11.0-1.azl3.x86_64.rpm

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,9 @@ build_rpm_in_chroot_no_install libxslt
541541
chroot_and_install_rpms pam
542542
build_rpm_in_chroot_no_install docbook-style-xsl
543543

544-
# libsolv needs cmake
544+
# libsolv needs cmake, zstd-devel
545545
chroot_and_install_rpms cmake
546+
chroot_and_install_rpms zstd
546547
build_rpm_in_chroot_no_install libsolv
547548

548549
# ccache needs cmake

0 commit comments

Comments
 (0)