Use vendored dependencies in RHEL builds
Related: RHEL-11408
This commit is contained in:
parent
571a696773
commit
3b67985e61
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/s390-tools-*.tar.gz
|
/s390-tools-*.tar.gz
|
||||||
|
/s390-tools-2.29.0-rust-vendor.tar.xz
|
||||||
|
@ -21,6 +21,11 @@ License: MIT
|
|||||||
ExclusiveArch: s390 s390x
|
ExclusiveArch: s390 s390x
|
||||||
URL: https://github.com/ibm-s390-linux/s390-tools
|
URL: https://github.com/ibm-s390-linux/s390-tools
|
||||||
Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
||||||
|
# To create the vendor tarball:
|
||||||
|
# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \
|
||||||
|
# rm -f Cargo.lock && cargo vendor && \
|
||||||
|
# tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
|
||||||
|
Source1: s390-tools-%{version}-rust-vendor.tar.xz
|
||||||
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
|
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
|
||||||
Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
|
Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
|
||||||
Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
|
Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
|
||||||
@ -56,6 +61,11 @@ Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
|||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%if %{with rust}
|
%if %{with rust}
|
||||||
|
%if 0%{?rhel}
|
||||||
|
BuildRequires: libcurl-devel
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: rust-toolset
|
||||||
|
%else
|
||||||
BuildRequires: crate(anstream)
|
BuildRequires: crate(anstream)
|
||||||
BuildRequires: crate(anstyle-query)
|
BuildRequires: crate(anstyle-query)
|
||||||
BuildRequires: crate(anyhow)
|
BuildRequires: crate(anyhow)
|
||||||
@ -80,6 +90,7 @@ BuildRequires: crate(thiserror)
|
|||||||
BuildRequires: crate(zerocopy)
|
BuildRequires: crate(zerocopy)
|
||||||
BuildRequires: rust-packaging
|
BuildRequires: rust-packaging
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is a meta package for installing the default s390-tools sub packages.
|
This is a meta package for installing the default s390-tools sub packages.
|
||||||
@ -103,7 +114,13 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
|
|||||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
||||||
|
|
||||||
%if %{with rust}
|
%if %{with rust}
|
||||||
|
%if 0%{?rhel}
|
||||||
|
pushd rust
|
||||||
|
%cargo_prep -V 1
|
||||||
|
popd
|
||||||
|
%else
|
||||||
%cargo_prep
|
%cargo_prep
|
||||||
|
%endif
|
||||||
rm -rf ./rust/pvsecret/Cargo.lock
|
rm -rf ./rust/pvsecret/Cargo.lock
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
1
sources
1
sources
@ -1 +1,2 @@
|
|||||||
SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617
|
SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617
|
||||||
|
SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 7ee717c5848e7b59c3e11ef6b461122e5f1195e67d11e378352b297926b498180222bfc23719d952fb11677a3fd440d299e0035ca6ab0c6d784573e9a5698594
|
||||||
|
Loading…
Reference in New Issue
Block a user