diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-05 09:06:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 09:06:20 -0800 |
| commit | 465e142bf28ed04e78c8b32c0ecef6fe72a38ecc (patch) | |
| tree | e03d16946d23e70d6f29cefde5e09545cfa88197 /Makefile | |
| parent | 4fb724c72e49768ed31d2dc85a7ad579f8d5c872 (diff) | |
| parent | a03c3a9318926c1b03d30a6aba6d10d8ba471475 (diff) | |
| download | podman-465e142bf28ed04e78c8b32c0ecef6fe72a38ecc.tar.gz podman-465e142bf28ed04e78c8b32c0ecef6fe72a38ecc.tar.bz2 podman-465e142bf28ed04e78c8b32c0ecef6fe72a38ecc.zip | |
Merge pull request #4601 from ssbarnea/fix/test-build-rpm-changes
Enable multi-platform rpm building
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -32,7 +32,9 @@ BUILDTAGS ?= \ exclude_graphdriver_devicemapper \ seccomp \ varlink -PYTHON ?= $(shell command -v python python3) +PYTHON ?= $(shell command -v python python3|head -n1) +PKG_MANAGER ?= $(shell command -v dnf yum|head -n1) + GO_BUILD=$(GO) build # Go module support: set `-mod=vendor` to use the vendored sources @@ -543,12 +545,19 @@ vendor-in-container: install.libseccomp.sudo \ lint \ pause \ + package \ + package-install \ shell \ uninstall \ validate \ validate.completions \ vendor -rpm: - @echo "Building rpms ..." +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/* ./contrib/build_rpm.sh + +package-install: package ## Install rpm packages + sudo ${PKG_MANAGER} -y install --allowerasing ${HOME}/rpmbuild/RPMS/*/*.rpm |