summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/build_rpm.sh1
-rw-r--r--contrib/cirrus/lib.sh4
-rwxr-xr-xcontrib/cirrus/runner.sh8
-rw-r--r--contrib/dependencies.txt1
-rw-r--r--contrib/spec/podman.spec.in1
-rw-r--r--contrib/spec/python-podman.spec.in7
-rw-r--r--contrib/varlink/io.podman.service15
-rw-r--r--contrib/varlink/io.podman.socket10
8 files changed, 2 insertions, 45 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh
index 6a82b131f..3039c1bf9 100755
--- a/contrib/build_rpm.sh
+++ b/contrib/build_rpm.sh
@@ -49,7 +49,6 @@ if [[ $pkg_manager == *dnf ]]; then
fi
PKGS+=(python3-devel \
- python3-varlink \
)
fi
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 04e8a3c1c..01e75d9a6 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -71,8 +71,8 @@ SCRIPT_BASE=${SCRIPT_BASE:-./contrib/cirrus}
# Downloaded, but not installed packages.
PACKAGE_DOWNLOAD_DIR=/var/cache/download
-# Log remote-client system test varlink output here
-PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/varlink.log
+# Log remote-client system test server output here
+PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/server.log
# Defaults when not running under CI
export CI="${CI:-false}"
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index bf2b1a52b..fa921f3e4 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -176,14 +176,6 @@ function _run_altbuild() {
*Without*)
make build-no-cgo
;;
- *varlink-API)
- export SUGGESTION='remove API.md, then "make varlink_api_generate" and commit changes.'
- make varlink_api_generate BUILDTAGS="varlink"
- ./hack/tree_status.sh
- ;;
- *varlink-binaries)
- make clean BUILDTAGS="varlink" binaries
- ;;
*RPM*)
make -f ./.copr/Makefile
rpmbuild --rebuild ./podman-*.src.rpm
diff --git a/contrib/dependencies.txt b/contrib/dependencies.txt
index f61912fde..2b36c947b 100644
--- a/contrib/dependencies.txt
+++ b/contrib/dependencies.txt
@@ -24,7 +24,6 @@ python3-pip
python3-psutil
python3-pytoml
python3-pyyaml
-python3-varlink
rsync
slirp4netns
unzip
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 7886a483b..3be44a3a3 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -166,7 +166,6 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4
# "-" are not accepted in version strings, so comment out below line
#Provides: bundled(golang(github.com/urfave/cli)) = fix-short-opts-parsing
-Provides: bundled(golang(github.com/varlink/go)) = master
Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2
Provides: bundled(golang(github.com/vishvananda/netlink)) = master
Provides: bundled(golang(github.com/vishvananda/netns)) = master
diff --git a/contrib/spec/python-podman.spec.in b/contrib/spec/python-podman.spec.in
index e21fb141e..1fc817d1f 100644
--- a/contrib/spec/python-podman.spec.in
+++ b/contrib/spec/python-podman.spec.in
@@ -36,20 +36,13 @@ BuildArch: noarch
BuildRequires: git
BuildRequires: python3-devel
BuildRequires: python3-setuptools
-BuildRequires: python3-varlink
Requires: python3-humanize
Requires: python3-pytoml
Requires: python3-setuptools
-Requires: python3-varlink
Requires: python3-psutil
Requires: podman
-%if 0%{?fedora}
-# 2018-07-20 RHEL8 doesn't have varlink RPM yet
-Requires: python3-varlink
-%endif
-
Provides: %{name} = %{version}-%{release}
%description
diff --git a/contrib/varlink/io.podman.service b/contrib/varlink/io.podman.service
deleted file mode 100644
index 5be5329f4..000000000
--- a/contrib/varlink/io.podman.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Podman Remote API Service
-Requires=io.podman.socket
-After=io.podman.socket
-Documentation=man:podman-varlink(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/podman varlink unix:%t/podman/io.podman --timeout=60000
-TimeoutStopSec=30
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-Also=io.podman.socket
diff --git a/contrib/varlink/io.podman.socket b/contrib/varlink/io.podman.socket
deleted file mode 100644
index f6a3ddc49..000000000
--- a/contrib/varlink/io.podman.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Podman Remote API Socket
-Documentation=man:podman-varlink(1)
-
-[Socket]
-ListenStream=%t/podman/io.podman
-SocketMode=0600
-
-[Install]
-WantedBy=sockets.target