diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-01 14:48:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 14:48:35 +0200 |
| commit | 22713d62e2860052e21e5e985fba169834709fdc (patch) | |
| tree | 495ca4947142903b66980f62bd1f64c1330f6979 /contrib/spec/podman.spec.in | |
| parent | bb05337f0a4bdd93838c120e239d86dce41a6498 (diff) | |
| parent | 8a914e8a0b268121ede5e54032025b4f51dd0b02 (diff) | |
| download | podman-22713d62e2860052e21e5e985fba169834709fdc.tar.gz podman-22713d62e2860052e21e5e985fba169834709fdc.tar.bz2 podman-22713d62e2860052e21e5e985fba169834709fdc.zip | |
Merge pull request #6353 from lsm5/build-without-varlink
enable building without `varlink` tag
Diffstat (limited to 'contrib/spec/podman.spec.in')
| -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 |