Patchwork packaging: fix "make centos{5,6,7}"

login
register
mail settings
Submitter via Mercurial-devel
Date Oct. 11, 2018, 8 p.m.
Message ID <6c5ae5bfae9f44950c04.1539288029@cuben.lan>
Download mbox | patch
Permalink /patch/35644/
State Accepted
Headers show

Comments

via Mercurial-devel - Oct. 11, 2018, 8 p.m.
# HG changeset patch
# User muxator <a.mux@inwind.it>
# Date 1539277362 -7200
#      Thu Oct 11 19:02:42 2018 +0200
# Node ID 6c5ae5bfae9f44950c041980f446310ea3f96dd3
# Parent  89742f1fa6cbf176259d694377aae17a0f7cd88d
packaging: fix "make centos{5,6,7}"

Without this change, make centos{5,6,7} fails with error:
    cp: cannot stat '<basedir>/rpmbuild/RPMS/*/*': No such file or directory

This change is the exact equivalent of bc4bbc42899a (which applied to Fedora).
Yuya Nishihara - Oct. 12, 2018, 5:29 a.m.
On Thu, 11 Oct 2018 22:00:29 +0200, Antonio Muci via Mercurial-devel wrote:
> # HG changeset patch
> # User muxator <a.mux@inwind.it>
> # Date 1539277362 -7200
> #      Thu Oct 11 19:02:42 2018 +0200
> # Node ID 6c5ae5bfae9f44950c041980f446310ea3f96dd3
> # Parent  89742f1fa6cbf176259d694377aae17a0f7cd88d
> packaging: fix "make centos{5,6,7}"

Queued, thanks.

Patch

diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -120,8 +120,8 @@  define centos_targets
 centos$(1):
 	mkdir -p $$(HGROOT)/packages/centos$(1)
 	./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)
-	cp $$(HGROOT)/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1)
-	cp $$(HGROOT)/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)
+	cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1)
+	cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)
 
 .PHONY: docker-centos$(1)
 docker-centos$(1):