# HG changeset patch # User Mads Kiilerich # Date 1401452073 -7200 # Node ID bb9a06d14857158d82ee5c7b3ac47d3d429da5be # Parent cf7b5c0117370a0e81d23bdb6935802940935f2a dockerrpm: prepare source outside docker and just run rpmbuild inside docker Simplifies the rpm build process. We will use platform specific rpmbuild directories and will not clean them and will drop the explicit copy to build directory. diff -r cf7b5c011737 -r bb9a06d14857 contrib/dockerrpm --- a/contrib/dockerrpm Fri May 30 14:14:33 2014 +0200 +++ b/contrib/dockerrpm Fri May 30 14:14:33 2014 +0200 @@ -31,5 +31,9 @@ echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER ) | $DOCKER build --tag $CONTAINER - -$DOCKER run -u $DBUILDUSER --rm -v $ROOTDIR:/hg $CONTAINER bash -c \ - "cp -a hg hg-build; cd hg-build; make clean local $PLATFORM; cp packages/$PLATFORM/* /hg/packages/$PLATFORM/" +RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM +contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare + +DSHARED=/mnt/shared +$DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ + rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean