diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-08 13:44:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 13:44:24 +0100 |
| commit | a8a766853efc0495b0972dfe76b1032f81786e31 (patch) | |
| tree | 0087938d2d6c7ca8fb55831afdbe53989b7e69ef /Makefile | |
| parent | b33c774c159dbaed9824a0c596a94be1630f0170 (diff) | |
| parent | da0319fecd2b046d64205abcccc318465e7ca696 (diff) | |
| download | podman-a8a766853efc0495b0972dfe76b1032f81786e31.tar.gz podman-a8a766853efc0495b0972dfe76b1032f81786e31.tar.bz2 podman-a8a766853efc0495b0972dfe76b1032f81786e31.zip | |
Merge pull request #4795 from ssbarnea/master
packaging: validate installed rpms
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 |