summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2020-01-06 10:57:49 +0000
committerSorin Sbarnea <ssbarnea@redhat.com>2020-01-07 20:06:27 +0000
commitda0319fecd2b046d64205abcccc318465e7ca696 (patch)
tree6fddf87cc233ef80f5eea90e48c78e9edbbd16bf /Makefile
parentbd3d8f4e282dc7a552d955bf5958b53d23937604 (diff)
downloadpodman-da0319fecd2b046d64205abcccc318465e7ca696.tar.gz
podman-da0319fecd2b046d64205abcccc318465e7ca696.tar.bz2
podman-da0319fecd2b046d64205abcccc318465e7ca696.zip
packaging: validate installed rpms
Previously we builded RPMs that contained an outdated conmon which was not compatible. From now on `make-install` will also call `podman version` and `podman info` in order to perform a minimal sanity check of the installation. Fixes: #4665 Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1173f43a0..686a0f957 100644
--- a/Makefile
+++ b/Makefile
@@ -572,10 +572,13 @@ vendor-in-container:
package: ## Build rpm packages
## TODO(ssbarnea): make version number predictable, it should not change
## on each execution, producing duplicates.
- rm -f ~/rpmbuild/RPMS/x86_64/* ~/rpmbuild/RPMS/noarch/*
+ rm -rf build/* *.src.rpm ~/rpmbuild/RPMS/*
./contrib/build_rpm.sh
+# Remember that rpms install exec to /usr/bin/podman while a `make install`
+# installs them to /usr/local/bin/podman which is likely before. Always use
+# a full path to test installed podman or you risk to call another executable.
package-install: package ## Install rpm packages
- sudo ${PKG_MANAGER} -y remove podman podman-remote
- sudo ${PKG_MANAGER} -y clean all
sudo ${PKG_MANAGER} -y install ${HOME}/rpmbuild/RPMS/*/*.rpm
+ /usr/bin/podman version
+ /usr/bin/podman info # will catch a broken conmon