!60 fix obs build problem and update gvisor-tap-vsock
From: @fu-shanqing Reviewed-by: @yangzhao_kl Signed-off-by: @yangzhao_kl
This commit is contained in:
commit
aa6a3c020a
BIN
gvisor-tap-vsock-0.5.0.tar.gz
Normal file
BIN
gvisor-tap-vsock-0.5.0.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
17
podman.spec
17
podman.spec
@ -2,7 +2,7 @@
|
||||
|
||||
Name: podman
|
||||
Version: 3.4.4
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: A daemonless container engine for managing Containers
|
||||
Epoch: 1
|
||||
License: ASL 2.0
|
||||
@ -10,12 +10,12 @@ URL: https://podman.io/
|
||||
Source0: https://github.com/containers/podman/archive/v3.4.4.tar.gz
|
||||
Source1: https://github.com/containers/dnsname/archive/18822f9a4fb35d1349eb256f4cd2bfd372474d84/dnsname-18822f9.tar.gz
|
||||
Source2: https://github.com/containers/podman-machine-cni/archive/0749884b8d1a455c68da30789e37811ec0809d51/podman-machine-cni-0749884.tar.gz
|
||||
Source3: https://github.com/containers/gvisor-tap-vsock/archive/4ee84d66bd86668f011733d8873989b5862bcd07/gvisor-tap-vsock-4ee84d6.tar.gz
|
||||
Source3: https://github.com/containers/gvisor-tap-vsock/archive/refs/tags/gvisor-tap-vsock-0.5.0.tar.gz
|
||||
Source4: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
|
||||
|
||||
BuildRequires: golang btrfs-progs-devel glib2-devel glibc-devel glibc-static
|
||||
BuildRequires: gpgme-devel libassuan-devel libgpg-error-devel libseccomp-devel
|
||||
BuildRequires: libselinux-devel ostree-devel pkgconfig make
|
||||
BuildRequires: libselinux-devel ostree-devel pkgconfig make git
|
||||
Requires: crun containers-common containernetworking-plugins >= 0.7.3-2 iptables nftables conmon
|
||||
Requires: (container-selinux if selinux-policy)
|
||||
Recommends: %{name}-plugins = %{epoch}:%{version}-%{release}
|
||||
@ -211,7 +211,7 @@ export GOPATH=$(pwd)/_build:$(pwd)
|
||||
%gobuild -o bin/%{name}-machine github.com/containers/podman-machine-cni/plugins/meta/%{name}-machine
|
||||
popd
|
||||
|
||||
pushd gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07
|
||||
pushd gvisor-tap-vsock-0.5.0
|
||||
mkdir _build
|
||||
pushd _build
|
||||
mkdir -p src/github.com/containers
|
||||
@ -253,7 +253,7 @@ pushd podman-machine-cni-0749884b8d1a455c68da30789e37811ec0809d51
|
||||
popd
|
||||
|
||||
# install gvproxy
|
||||
pushd gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07
|
||||
pushd gvisor-tap-vsock-0.5.0
|
||||
install -dp %{buildroot}%{_libexecdir}/%{name}
|
||||
install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
|
||||
popd
|
||||
@ -312,12 +312,15 @@ done
|
||||
%{_libexecdir}/cni/%{name}-machine
|
||||
|
||||
%files gvproxy
|
||||
%license gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07/LICENSE
|
||||
%doc gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07/README.md
|
||||
%license gvisor-tap-vsock-0.5.0/LICENSE
|
||||
%doc gvisor-tap-vsock-0.5.0/README.md
|
||||
%dir %{_libexecdir}/%{name}
|
||||
%{_libexecdir}/%{name}/gvproxy
|
||||
|
||||
%changelog
|
||||
* Tue Feb 14 2023 fushanqing <fushanqing@kylinos.cn> - 1:3.4.4-3
|
||||
- fix obs build problem
|
||||
|
||||
* Tue Jul 26 2022 laokz <laokz@foxmail.com> - 1:3.4.4-2
|
||||
- remove redundant patch2
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user