[PATCH STABLE] dockerrpm: fix CentOS 5 RPMs (issue4977)

Augie Fackler raf at durin42.com
Tue Jan 5 10:31:16 CST 2016


On Mon, Jan 04, 2016 at 02:26:33PM -0600, Mathias De Maré wrote:
> # HG changeset patch
> # User Mathias De Maré <mathias.demare at gmail.com>
> # Date 1451938919 -3600
> #      Mon Jan 04 21:21:59 2016 +0100
> # Branch stable
> # Node ID 51b021f55c0abba924d3008b8dbabc35116a5a49
> # Parent  7c598947fbbd78b26989326c61345c6e46855bdc
> dockerrpm: fix CentOS 5 RPMs (issue4977)
>
> The older rpmbuild in CentOS 5 fails if some of the output directories
> have not been created yet. This change results in creating those directories.

FML. Queued.

>
> diff --git a/contrib/dockerrpm b/contrib/dockerrpm
> --- a/contrib/dockerrpm
> +++ b/contrib/dockerrpm
> @@ -15,6 +15,8 @@
>  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
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list