diff options
| author | Lokesh Mandvekar <lsm5@fedoraproject.org> | 2022-01-25 08:09:05 -0500 |
|---|---|---|
| committer | Lokesh Mandvekar <lsm5@fedoraproject.org> | 2022-01-25 08:27:44 -0500 |
| commit | e4636ebdc84ca28cf378873435cc9a27c81756f8 (patch) | |
| tree | 8eb70710585eccbc8a8d42d38d1b4ebadc4f192c /contrib/cirrus | |
| parent | 534c4881b51b1bffaac1afcfbcfdc0dde09ccdb4 (diff) | |
| download | podman-e4636ebdc84ca28cf378873435cc9a27c81756f8.tar.gz podman-e4636ebdc84ca28cf378873435cc9a27c81756f8.tar.bz2 podman-e4636ebdc84ca28cf378873435cc9a27c81756f8.zip | |
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 <lsm5@fedoraproject.org>
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) |