[PATCH STABLE] buildrpm: move creation of RPM directories from dockerrpm

Mathias De Maré mathias.demare at gmail.com
Tue Jan 12 16:23:47 UTC 2016


# HG changeset patch
# User Mathias De Maré <mathias.demare at gmail.com>
# Date 1452145477 -3600
#      Thu Jan 07 06:44:37 2016 +0100
# Branch stable
# Node ID e505b8864dd50b333edb14a7c37baa0cff9a8aba
# Parent  6c7d26cef0cda4752c02b7478f1270a84393510b
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 --git a/contrib/buildrpm b/contrib/buildrpm
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -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 --git a/contrib/dockerrpm b/contrib/dockerrpm
--- a/contrib/dockerrpm
+++ b/contrib/dockerrpm
@@ -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


More information about the Mercurial-devel mailing list