Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b68907b581 | ||
|
|
6489a7dab5 | ||
|
65a5cc2abb |
8 changed files with 80 additions and 85 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -7,13 +7,3 @@
|
|||
/virtiofsd-1.9.0.crate
|
||||
/virtiofsd-1.10.0.crate
|
||||
/virtiofsd-1.10.1.crate
|
||||
/virtiofsd-1.11.1.crate
|
||||
/virtiofsd-1.11.1-vendor.tar.xz
|
||||
/virtiofsd-1.13.0.crate
|
||||
/virtiofsd-1.13.0-vendor.tar.xz
|
||||
/virtiofsd-1.13.2.crate
|
||||
/virtiofsd-1.13.2-vendor.tar.xz
|
||||
/virtiofsd-1.13.3.crate
|
||||
/virtiofsd-1.13.3-vendor.tar.xz
|
||||
/virtiofsd-1.14.0.crate
|
||||
/virtiofsd-1.14.0-vendor.tar.xz
|
||||
|
|
|
|||
23
Makefile
23
Makefile
|
|
@ -1,23 +0,0 @@
|
|||
NAME := virtiofsd
|
||||
VERSION ?= $(shell grep Version: virtiofsd.spec | tr -d ' ' | cut -f2 -d:)
|
||||
|
||||
.PHONY: all down-crate vendor clean
|
||||
|
||||
all: down-crate vendor clean
|
||||
|
||||
down-crate:
|
||||
@echo Downloading version $(VERSION)
|
||||
curl -L https://crates.io/api/v1/crates/$(NAME)/$(VERSION)/download -o $(NAME)-$(VERSION).crate
|
||||
|
||||
vendor:
|
||||
# After vendorize we need to remove winapi/windows binaries
|
||||
tar xf $(NAME)-$(VERSION).crate && \
|
||||
pushd $(NAME)-$(VERSION) && \
|
||||
cargo vendor && \
|
||||
find vendor/ -name *.a -print0 | xargs -0 rm && \
|
||||
tar Jcvf ../$(NAME)-$(VERSION)-vendor.tar.xz vendor/ && \
|
||||
popd
|
||||
|
||||
clean:
|
||||
rm -rf $(NAME)-$(VERSION)
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (virtiofsd-1.14.0.crate) = 8961384262144c98993808707cf832937217808a84cc5ac2cba375c2bb0f6fe108738dba4fa3d84d837422e59a27859ba2ea42ce40321eccb6ae9822eb319536
|
||||
SHA512 (virtiofsd-1.14.0-vendor.tar.xz) = e5d9d0bd8bfd764a85b98136ee940512b16aeec807c7847ed104d018a1f3966bdb92c04534c875ec17ae3d66189fbf1404a202dec0372616951e758d3e190960
|
||||
SHA512 (virtiofsd-1.10.1.crate) = cc4628595eb0a71b1147b00e2ebefe87cf26bba3ebcd907d6bde6a4c7a6f9125d67ebac24a862a07ad7af5b14a0680f3c526b947f28db3ed99fde3a551dc2284
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
remote_user: root
|
||||
tests:
|
||||
- virtiofsd_printcaps:
|
||||
dir: .
|
||||
run: ./virtiofsd_printcaps.sh
|
||||
required_packages:
|
||||
- virtiofsd
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
/usr/libexec/virtiofsd --print-capabilities
|
||||
13
virtiofsd-relax-env_logger-dep.diff
Normal file
13
virtiofsd-relax-env_logger-dep.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index cedd3f4..082cd68 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -31,7 +31,7 @@ version = "1.2"
|
||||
version = "0.2.2"
|
||||
|
||||
[dependencies.env_logger]
|
||||
-version = "0.10.0"
|
||||
+version = "0.9.0"
|
||||
|
||||
[dependencies.futures]
|
||||
version = "0.3"
|
||||
|
|
@ -1,36 +1,20 @@
|
|||
Name: virtiofsd
|
||||
Version: 1.14.0
|
||||
Release: %autorelease
|
||||
Version: 1.10.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Virtio-fs vhost-user device daemon (Rust version)
|
||||
|
||||
License: Apache-2.0 AND BSD-3-Clause
|
||||
URL: https://gitlab.com/virtio-fs/virtiofsd
|
||||
# To create/dowload the source files (i.e., crate and vendor files),
|
||||
# set the version in the spec and then:
|
||||
# make
|
||||
# if you need to get a different version:
|
||||
# make VERSION=<version>
|
||||
#
|
||||
Source: %{crates_source}
|
||||
Source1: %{name}-%{version}-vendor.tar.xz
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
# Some of our deps (i.e. vm-memory) are not available on 32 bits targets.
|
||||
ExcludeArch: i686
|
||||
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: rust-toolset
|
||||
%else
|
||||
BuildRequires: rust-packaging >= 21
|
||||
%endif
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libseccomp-devel
|
||||
%if 0%{?rhel}
|
||||
Requires: qemu-kvm-common
|
||||
%else
|
||||
Requires: qemu-common
|
||||
%endif
|
||||
Requires: shadow-utils
|
||||
Provides: vhostuser-backend(fs)
|
||||
Conflicts: qemu-virtiofsd
|
||||
%if 0%{?fedora} > 38
|
||||
|
|
@ -42,28 +26,81 @@ Provides: qemu-virtiofsd = 2:7.2.1-1
|
|||
%{summary}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version_no_tilde} -p1 -a1
|
||||
%cargo_prep -v vendor
|
||||
rm -f Cargo.lock
|
||||
%autosetup -n %{name}-%{version_no_tilde} -p1
|
||||
%cargo_prep
|
||||
|
||||
%generate_buildrequires
|
||||
%cargo_generate_buildrequires
|
||||
|
||||
%build
|
||||
%cargo_build
|
||||
%cargo_license_summary
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
%cargo_vendor_manifest
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_libexecdir}
|
||||
install -D -p -m 0755 target/release/virtiofsd %{buildroot}%{_libexecdir}/virtiofsd
|
||||
install -D -p -m 0644 50-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-user/50-virtiofsd.json
|
||||
install -D -p -m 0644 50-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
|
||||
|
||||
%files
|
||||
%license LICENSE-APACHE LICENSE-BSD-3-Clause
|
||||
%license LICENSE.dependencies
|
||||
%license cargo-vendor.txt
|
||||
%doc README.md
|
||||
%{_libexecdir}/virtiofsd
|
||||
%{_datadir}/qemu/vhost-user/50-virtiofsd.json
|
||||
%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Mon Feb 05 2024 Sergio Lopez <slp@redhat.com> - 1.10.1-1
|
||||
- Update to version 1.10.1
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Jan 23 2024 Sergio Lopez <slp@redhat.com> - 1.10.0-1
|
||||
- Update to version 1.10.0
|
||||
|
||||
* Sun Dec 24 2023 Sergio Lopez <slp@redhat.com> - 1.9.0-1
|
||||
- Update to version 1.9.0
|
||||
|
||||
* Fri Sep 29 2023 Colin Walters <walters@verbum.org> - 1.7.0-5
|
||||
- Rebuild with latest vhost-user-backend; xref
|
||||
https://gitlab.com/virtio-fs/virtiofsd/-/issues/62#note_1584371000
|
||||
|
||||
* Tue Sep 19 2023 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-4
|
||||
- Rebuild for vm-memory v0.12.2 / CVE-2023-41051.
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Sergio Lopez <slp@redhat.com> - 1.7.0-2
|
||||
- Update license specification to conform SPDX format
|
||||
|
||||
* Tue Jul 18 2023 Sergio Lopez <slp@redhat.com> - 1.7.0-1
|
||||
- Update to version 1.7.0
|
||||
- Drop no longer needed temporary patch
|
||||
|
||||
* Tue May 09 2023 Sergio Lopez <slp@redhat.com> - 1.5.1-3
|
||||
- Only use Obsoletes/Provides on Fedora 39 and later
|
||||
|
||||
* Wed Apr 26 2023 Daniel P. Berrangé <berrange@redhat.com> - 1.5.1-2
|
||||
- Add Obsoletes/Provides for qemu-virtiofsd to get an upgrade path (rhbz #2189368)
|
||||
|
||||
* Thu Feb 09 2023 Sergio Lopez <slp@redhat.com> - 1.5.1-1
|
||||
- Update to version 1.5.1
|
||||
|
||||
* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-3
|
||||
- Rebuild for fixed frame pointer compiler flags in Rust RPM macros.
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Jul 26 2022 Sergio Lopez <slp@redhat.com> - 1.4.0-1
|
||||
- Update to version 1.4.0
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 06 2022 Sergio Lopez <slp@redhat.com> - 1.3.0-1
|
||||
- Update to version 1.3.0
|
||||
- Build on all rust arches except i686 (32-bit targets are not supported)
|
||||
|
||||
* Mon May 16 2022 Sergio Lopez <slp@redhat.com> - 1.2.0-1
|
||||
- Initial package
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue