From e4636ebdc84ca28cf378873435cc9a27c81756f8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 25 Jan 2022 08:09:05 -0500 Subject: Makefile: install targets independent of build Building from source would involve separate `make` and `make install` steps. This removes a lot of unnecessary `-nobuild` targets which were otherwise needed for packaging. This commit also removes spec files for unused copr jobs. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- contrib/cirrus/runner.sh | 3 +-- contrib/cirrus/setup_environment.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'contrib/cirrus') 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) -- cgit v1.2.3-54-g00ecf