# HG changeset patch # User Mads Kiilerich # Date 1572607097 -3600 # Node ID 433cdcb373218eb096f402cbe18b748dc02939c3 # Parent 166808ff91de33d52b52ce7896a956ed42fdf6a3 packaging: move dockerrpm output directory creation to dockerrpm Avoid having to compute the directory in two places in different environments. diff -r 166808ff91de -r 433cdcb37321 contrib/packaging/Makefile --- 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 diff -r 166808ff91de -r 433cdcb37321 contrib/packaging/dockerrpm --- 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