# HG changeset patch # User Mathias De Maré # Date 1452145477 -3600 # Node ID d713fa934fb95581953f0ef2873973a3661a41c1 # Parent e6e34c4e391668c5d8af8f98c004a27c77b1e2fa buildrpm: move creation of RPM directories from dockerrpm Handling the creation of the RPM directories in buildrpm is more consistent and takes care of non-docker builds as well. diff -r e6e34c4e3916 -r d713fa934fb9 contrib/buildrpm --- a/contrib/buildrpm Thu Jan 14 10:31:06 2016 -0800 +++ b/contrib/buildrpm Thu Jan 07 06:44:37 2016 +0100 @@ -68,7 +68,7 @@ RPMPYTHONVER=%{nil} fi -mkdir -p $RPMBUILDDIR/SOURCES +mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS} $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz if [ "$PYTHONVER" ]; then ( diff -r e6e34c4e3916 -r d713fa934fb9 contrib/dockerrpm --- a/contrib/dockerrpm Thu Jan 14 10:31:06 2016 -0800 +++ b/contrib/dockerrpm Thu Jan 07 06:44:37 2016 +0100 @@ -15,8 +15,6 @@ RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* -mkdir -p $RPMBUILDDIR/{BUILD,SRPMS,RPMS} - DSHARED=/mnt/shared $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean