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

Anton Shestakov engored at ya.ru
Tue Jan 12 11:18:34 CST 2016


13.01.2016, 00:25, "Mathias De Mar" <mathias.demare at gmail.com>:
>  # 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}

Turns out {x,y} is a bashism, so sh creates a literal {SOURCES,BUILD,SRPMS,RPMS} directory.

This is frustrating, but I've just tried buildrpm (via `make fedora21`) on a fedora 21 box in vagrant and packages/ looks like this:

packages/
└── fedora21
    ├── mercurial-3.6.3-1+6c7d26cef0cd.src.rpm
    ├── mercurial-3.6.3-1+6c7d26cef0cd.x86_64.rpm
    └── mercurial-debuginfo-3.6.3-1+6c7d26cef0cd.x86_64.rpm

So there's a chance we don't even need all these mkdir -p in buildrpm? Not sure, I'll try and find a usable centos5 image.


More information about the Mercurial-devel mailing list