##// END OF EJS Templates
buildrpm: move creation of RPM directories from dockerrpm...
Mathias De Maré -
r27788:d713fa93 default
parent child Browse files
Show More
@@ -68,7 +68,7 b' else'
68 RPMPYTHONVER=%{nil}
68 RPMPYTHONVER=%{nil}
69 fi
69 fi
70
70
71 mkdir -p $RPMBUILDDIR/SOURCES
71 mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS}
72 $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
72 $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
73 if [ "$PYTHONVER" ]; then
73 if [ "$PYTHONVER" ]; then
74 (
74 (
@@ -15,8 +15,6 b' initcontainer $PLATFORM'
15 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
15 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
16 contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
16 contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
17
17
18 mkdir -p $RPMBUILDDIR/{BUILD,SRPMS,RPMS}
19
20 DSHARED=/mnt/shared
18 DSHARED=/mnt/shared
21 $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
19 $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
22 rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
20 rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean
General Comments 0
You need to be logged in to leave comments. Login now