rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove varlink build tag and steps

Browse Source 
The varlink interface is being replaced by API v2. PR #6353
turns off varlink builds by default, but it looks like that
broke our koji builds. This commit is an attempt to get
koji builds working again.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2020-06-01 10:48:43 -06:00
parent 643aea1fe8
commit 5907c5c652
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
podman.spec
View File

@ -5,10 +5,8 @@
%if 0%{?fedora} || 0%{?centos} >= 8 %if 0%{?fedora} || 0%{?centos} >= 8
#### DO NOT REMOVE - NEEDED FOR CENTOS #### DO NOT REMOVE - NEEDED FOR CENTOS
%bcond_without varlink
%global with_debug 1 %global with_debug 1
%else %else
%bcond_with varlink
%global with_debug 0 %global with_debug 0
%endif %endif
@ -95,7 +93,6 @@ Recommends: crun >= 0.13-2
%if 0%{?fedora} || 0%{?centos} >= 8 %if 0%{?fedora} || 0%{?centos} >= 8
Recommends: catatonit Recommends: catatonit
Recommends: container-selinux Recommends: container-selinux
Recommends: libvarlink-util
Recommends: runc Recommends: runc
Recommends: slirp4netns >= 0.3.0-2 Recommends: slirp4netns >= 0.3.0-2
%else %else
@ -421,7 +418,7 @@ Remote client for managing %{name} containers.
This experimental remote client is under heavy development. Please do not This experimental remote client is under heavy development. Please do not
run %{name}-remote in production. run %{name}-remote in production.
%{name}-remote uses the varlink connection to connect to a %{name} client to %{name}-remote uses the version 2 API to connect to a %{name} client to
manage pods, containers and container images. %{name}-remote supports ssh manage pods, containers and container images. %{name}-remote supports ssh
connections as well. connections as well.
%endif %endif
@ -453,10 +450,9 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path} ln -s ../../../../ src/%{import_path}
popd popd
ln -s vendor src ln -s vendor src
%gogenerate ./pkg/varlink/...
# build %%{name} # build %%{name}
export BUILDTAGS="ABISupport systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)" export BUILDTAGS="ABISupport systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh)"
%if 0%{?centos} %if 0%{?centos}
export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub" export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
%endif %endif