diff options
| author | Lokesh Mandvekar <lsm5@fedoraproject.org> | 2020-05-29 14:38:33 -0400 |
|---|---|---|
| committer | Lokesh Mandvekar <lsm5@fedoraproject.org> | 2020-05-29 14:38:33 -0400 |
| commit | 8a914e8a0b268121ede5e54032025b4f51dd0b02 (patch) | |
| tree | 11212f7766f5183e8c76e15a61a2ad04590865ef /contrib | |
| parent | 0eea051b92da367469848aac93657653e004a603 (diff) | |
| download | podman-8a914e8a0b268121ede5e54032025b4f51dd0b02.tar.gz podman-8a914e8a0b268121ede5e54032025b4f51dd0b02.tar.bz2 podman-8a914e8a0b268121ede5e54032025b4f51dd0b02.zip | |
default build without `varlink` tag
Issue gh#6286 was already fixed in a prior commit but the Makefile still
ran some varlink steps by default.
This commit makes any varlink build steps dependent on the varlink
build tag and also makes the contrib rpm spec file independent of
varlink.
Endpoint tests will be run only if BUILDTAGS contains varlink.
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/spec/podman.spec.in | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index e4415c291..701b5f0b1 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -5,12 +5,6 @@ %bcond_without doc %bcond_without debug -%if 0%{?fedora} >= 28 -%bcond_without varlink -%else -%bcond_with varlink -%endif - %if %{with debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -387,9 +381,7 @@ popd ln -s vendor src export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="varlink selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" - -GOPATH=$GOPATH go generate ./pkg/varlink/... +export BUILDTAGS="selinux seccomp systemd $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" %if %{with doc} BUILDTAGS=$BUILDTAGS make binaries docs @@ -503,15 +495,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/zsh/site-functions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist -%{_unitdir}/io.podman.service -%{_unitdir}/io.podman.socket -%{_usr}/lib/systemd/user/io.podman.service -%{_usr}/lib/systemd/user/io.podman.socket %{_unitdir}/podman.service %{_unitdir}/podman.socket %{_usr}/lib/systemd/user/podman.service %{_usr}/lib/systemd/user/podman.socket -%{_usr}/lib/tmpfiles.d/%{name}.conf %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list |