folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update zstd (#1539)

This commit is contained in:
Thomas Crain 2021-10-14 13:55:36 -07:00 committed by GitHub
parent c639bdcaeb
commit abf0a99d98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPECS/zstd/zstd.signatures.json
View File

@ -1,5 +1,5 @@
{
"Signatures": {
"zstd-1.4.4.tar.gz": "59ef70ebb757ffe74a7b3fe9c305e2ba3350021a918d168a046c6300aeea9315"
"zstd-1.5.0.tar.gz": "5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94"
}
}

56
SPECS/zstd/zstd.spec
View File

@ -1,82 +1,86 @@
Summary: Tools for zstd compression and decompression
Name: zstd
Version: 1.4.4
Release: 2%{?dist}
URL: https://facebook.github.io/zstd/
License: BSD and GPLv2
Group: Applications/File
Version: 1.5.0
Release: 1%{?dist}
License: BSD or GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Applications/File
URL: https://facebook.github.io/zstd/
Source0: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz
Requires: zstd-libs = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%description
The zstd package contains programs for compressing and decompressing files
%package devel
%package devel
Summary: Header and development files for zstd
Requires: %{name} = %{version}-%{release}
Provides: lib%{name}-devel = %{version}-%{release}
%description devel
Header and development files for zstd compression
%package libs
%package libs
Summary: Libraries for zstd
Group: System Environment/Libraries
Provides: lib%{name} = %{version}-%{release}
%description libs
%description libs
This package contains minimal set of shared zstd libraries.
%package doc
%package doc
Summary: Documentation files for zstd
Requires: %{name} = %{version}-%{release}
%description doc
%description doc
Documentation files for zstd
%prep
%setup -q
%autosetup
%build
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=%{buildroot} prefix=%{_prefix}
rm %{buildroot}%{_libdir}/libzstd.a
%make_install prefix=%{_prefix}
find %{buildroot} -type f -name "*.a" -delete -print
%check
make check %{?_smp_mflags}
%make_build check
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%defattr(-,root,root)
%license LICENSE COPYING
%{_bindir}/unzstd
%{_bindir}/zstd
%{_bindir}/zstdless
%{_bindir}/zstdmt
%{_bindir}/unzstd
%{_bindir}/zstdgrep
%{_bindir}/zstdcat
%files devel
%exclude %{_includedir}/zbuff.h
%{_includedir}/*.h
%{_libdir}/pkgconfig/libzstd.pc
%{_libdir}/libzstd.so
%files libs
%license LICENSE COPYING
%{_libdir}/libzstd.so.*
%{_libdir}/libzstd.so.1*
%files doc
%{_mandir}/man1/*
%changelog
* Tue Oct 12 2021 Thomas Crain <thcrain@microsoft.com> - 1.5.0-1
- Upgrade to latest upstream version
- Change license tag to properly reflect dual licensing situation
- Remove licenses from main package (pulled in through libs subpackage)
- Lint spec
* Thu Feb 04 2021 Joe Schmitt <joschmit@microsoft.com> - 1.4.4-2
- Provide libzstd and libzstd-devel
* Sat May 2 2020 Henry Beberman <henry.beberman@microsoft.com> 1.4.4-1
- Original version for CBL-Mariner.
* Sat May 2 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.4.4-1
- Original version for CBL-Mariner.

4
cgmanifest.json
View File

@ -9793,8 +9793,8 @@
"type": "other",
"other": {
"name": "zstd",
"version": "1.4.4",
"downloadUrl": "https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz"
"version": "1.5.0",
"downloadUrl": "https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz"
}
}
}

6
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -71,9 +71,9 @@ xz-5.2.4-4.cm2.aarch64.rpm
xz-devel-5.2.4-4.cm2.aarch64.rpm
xz-lang-5.2.4-4.cm2.aarch64.rpm
xz-libs-5.2.4-4.cm2.aarch64.rpm
zstd-1.4.4-2.cm2.aarch64.rpm
zstd-devel-1.4.4-2.cm2.aarch64.rpm
zstd-libs-1.4.4-2.cm2.aarch64.rpm
zstd-1.5.0-1.cm2.aarch64.rpm
zstd-devel-1.5.0-1.cm2.aarch64.rpm
zstd-libs-1.5.0-1.cm2.aarch64.rpm
libtool-2.4.6-7.cm2.aarch64.rpm
flex-2.6.4-7.cm2.aarch64.rpm
flex-devel-2.6.4-7.cm2.aarch64.rpm

6
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -71,9 +71,9 @@ xz-5.2.4-4.cm2.x86_64.rpm
xz-devel-5.2.4-4.cm2.x86_64.rpm
xz-lang-5.2.4-4.cm2.x86_64.rpm
xz-libs-5.2.4-4.cm2.x86_64.rpm
zstd-1.4.4-2.cm2.x86_64.rpm
zstd-devel-1.4.4-2.cm2.x86_64.rpm
zstd-libs-1.4.4-2.cm2.x86_64.rpm
zstd-1.5.0-1.cm2.x86_64.rpm
zstd-devel-1.5.0-1.cm2.x86_64.rpm
zstd-libs-1.5.0-1.cm2.x86_64.rpm
libtool-2.4.6-7.cm2.x86_64.rpm
flex-2.6.4-7.cm2.x86_64.rpm
flex-devel-2.6.4-7.cm2.x86_64.rpm

10
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -594,8 +594,8 @@ zip-debuginfo-3.0-5.cm2.aarch64.rpm
zlib-1.2.11-5.cm2.aarch64.rpm
zlib-debuginfo-1.2.11-5.cm2.aarch64.rpm
zlib-devel-1.2.11-5.cm2.aarch64.rpm
zstd-1.4.4-2.cm2.aarch64.rpm
zstd-debuginfo-1.4.4-2.cm2.aarch64.rpm
zstd-devel-1.4.4-2.cm2.aarch64.rpm
zstd-doc-1.4.4-2.cm2.aarch64.rpm
zstd-libs-1.4.4-2.cm2.aarch64.rpm
zstd-1.5.0-1.cm2.aarch64.rpm
zstd-debuginfo-1.5.0-1.cm2.aarch64.rpm
zstd-devel-1.5.0-1.cm2.aarch64.rpm
zstd-doc-1.5.0-1.cm2.aarch64.rpm
zstd-libs-1.5.0-1.cm2.aarch64.rpm

10
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -594,8 +594,8 @@ zip-debuginfo-3.0-5.cm2.x86_64.rpm
zlib-1.2.11-5.cm2.x86_64.rpm
zlib-debuginfo-1.2.11-5.cm2.x86_64.rpm
zlib-devel-1.2.11-5.cm2.x86_64.rpm
zstd-1.4.4-2.cm2.x86_64.rpm
zstd-debuginfo-1.4.4-2.cm2.x86_64.rpm
zstd-devel-1.4.4-2.cm2.x86_64.rpm
zstd-doc-1.4.4-2.cm2.x86_64.rpm
zstd-libs-1.4.4-2.cm2.x86_64.rpm
zstd-1.5.0-1.cm2.x86_64.rpm
zstd-debuginfo-1.5.0-1.cm2.x86_64.rpm
zstd-devel-1.5.0-1.cm2.x86_64.rpm
zstd-doc-1.5.0-1.cm2.x86_64.rpm
zstd-libs-1.5.0-1.cm2.x86_64.rpm

2
toolkit/scripts/toolchain/container/toolchain-remote-wget-list
View File

@ -132,4 +132,4 @@ https://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
https://www.x.org/pub/individual/proto/xineramaproto-1.2.1.tar.bz2
https://www.x.org/pub/individual/proto/xproto-7.0.31.tar.bz2
https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz
https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz
https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz

2
toolkit/scripts/toolchain/container/toolchain-sha256sums
View File

@ -149,4 +149,4 @@ c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 xproto-7.0.31.
adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 xtrans-1.3.5.tar.bz2
9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b xz-5.2.4.tar.xz
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz
59ef70ebb757ffe74a7b3fe9c305e2ba3350021a918d168a046c6300aeea9315 zstd-1.4.4.tar.gz
5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94 zstd-1.5.0.tar.gz

8
toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
View File

@ -650,13 +650,13 @@ popd
rm -rf xz-5.2.4
touch /logs/status_xz_complete
echo zstd-1.4.4
tar xf zstd-1.4.4.tar.gz
pushd zstd-1.4.4
echo zstd-1.5.0
tar xf zstd-1.5.0.tar.gz
pushd zstd-1.5.0
make -j$(nproc)
make install prefix=/usr pkgconfigdir=/usr/lib/pkgconfig
popd
rm -rf zstd-1.4.4
rm -rf zstd-1.5.0
touch /logs/status_zstd_complete
echo Gettext-0.19.8.1

8
toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh
View File

@ -596,13 +596,13 @@ rm -rf xz-5.2.4
touch $LFS/logs/temptoolchain/status_xz_complete
echo zstd-1.4.4
tar xf zstd-1.4.4.tar.gz
pushd zstd-1.4.4
echo zstd-1.5.0
tar xf zstd-1.5.0.tar.gz
pushd zstd-1.5.0
make -j$(nproc)
make install prefix=/tools pkgconfigdir=/tools/lib/pkgconfig
popd
rm -rf zstd-1.4.4
rm -rf zstd-1.5.0
touch $LFS/logs/temptoolchain/status_zstd_complete