Mercurial > hg
changeset 43355:433cdcb37321 stable
packaging: move dockerrpm output directory creation to dockerrpm
Avoid having to compute the directory in two places in different environments.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 01 Nov 2019 12:18:17 +0100 |
| parents | 166808ff91de |
| children | 5989f697890a |
| files | contrib/packaging/Makefile contrib/packaging/dockerrpm |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/packaging/Makefile Thu Oct 31 11:53:11 2019 +0100 +++ b/contrib/packaging/Makefile Fri Nov 01 12:18:17 2019 +0100 @@ -105,7 +105,6 @@ .PHONY: docker-fedora$(1) docker-fedora$(1): - mkdir -p $$(HGROOT)/packages/fedora$(1) ./dockerrpm fedora$(1) endef @@ -123,7 +122,6 @@ .PHONY: docker-centos$(1) docker-centos$(1): - mkdir -p $$(HGROOT)/packages/centos$(1) ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython) endef
--- a/contrib/packaging/dockerrpm Thu Oct 31 11:53:11 2019 +0100 +++ b/contrib/packaging/dockerrpm Fri Nov 01 12:18:17 2019 +0100 @@ -21,6 +21,7 @@ $BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $BUILDDIR/docker/$PLATFORM $CONTAINER RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM +mkdir -p $RPMBUILDDIR $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* DSHARED=/mnt/shared