Mercurial > hg

changeset 27788:d713fa934fb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mathias De Maré <mathias.demare@gmail.com>
date Thu, 07 Jan 2016 06:44:37 +0100
parents e6e34c4e3916
children 63116d47cc3f
files contrib/buildrpm contrib/dockerrpm
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 (
--- 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