diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-25 13:15:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 13:15:45 -0500 |
| commit | fa9ab1f5f7365b73c2678f9b0ca15357ecb76a3b (patch) | |
| tree | 57a5696fb9e9cdbfd8be7e8749c0e75d3aa7b0dc /contrib/cirrus | |
| parent | 92635c726ac063770f20ce9cc3da48f33a5ad73b (diff) | |
| parent | e4636ebdc84ca28cf378873435cc9a27c81756f8 (diff) | |
| download | podman-fa9ab1f5f7365b73c2678f9b0ca15357ecb76a3b.tar.gz podman-fa9ab1f5f7365b73c2678f9b0ca15357ecb76a3b.tar.bz2 podman-fa9ab1f5f7365b73c2678f9b0ca15357ecb76a3b.zip | |
Merge pull request #12966 from lsm5/makefile-separate-build-install
Makefile: install targets independent of build
Diffstat (limited to 'contrib/cirrus')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index c52fd9216..f0223f9eb 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -233,8 +233,7 @@ function _run_altbuild() { make build-no-cgo ;; *RPM*) - make -f ./.copr/Makefile - rpmbuild --rebuild ./podman-*.src.rpm + make package ;; Alt*Cross) arches=(\ diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 03b954a5b..44c821bc1 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -218,7 +218,7 @@ case "$TEST_FLAVOR" in # Defined in .cirrus.yml # shellcheck disable=SC2154 if [[ "$ALT_NAME" =~ RPM ]]; then - bigto dnf install -y glibc-minimal-langpack rpm-build + bigto dnf install -y glibc-minimal-langpack go-rpm-macros rpkg rpm-build shadow-utils-subid-devel fi ;& docker-py) |