On Monday, July 12, 2010 11:27:56 pm you wrote: > Le 12/07/2010 23:17, Jirka Hladky a écrit : > > Hi Brice, > > > > thanks for backporting patch to the 1.0 branch: > > > > --- Comment #16 from Brice Goglin <brice.gog...@inria.fr> 2010-07-12 > > 16:41:53 EDT --- > > > > FYI, upstream patch backported to the 1.0 branch in commit r2304 > > > > https://svn.open-mpi.org/trac/hwloc/changeset/2304 > > > > I would need to advice what would be the best way to create a patch > > file against 1.0.1. I'm familiar with this method: > > > > diff -rupN hwloc-1.0.1/ 2304/ > original.patch > > > > How can I download complete hwloc dir for commit r2304? > > > > Is there some better way how to create a patch file? > > > > Thanks! > > > > Jirka > > This should give you a patch: > > svn diff http://svn.open-mpi.org/svn/hwloc/tags/hwloc-1.0.1 > http://svn.open-mpi.org/svn/hwloc/branches/v1.0 > my.patch
I have tried it but no luck (or perhaps I have done some mistake): tar zxvf ~/tests/performance/hwloc/hwloc-1.0.1.tar.gz cd hwloc-1.0.1/ $patch -p0 -i ../my.patch patching file include/private/private.h ..........stripped......... upto this error message: patching file utils/Makefile.am can't find file to patch at input line 822 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: tests/embedded/Makefile.am |=================================================================== |--- tests/embedded/Makefile.am (.../tags/hwloc-1.0.1) (revision 2305) |+++ tests/embedded/Makefile.am (.../branches/v1.0) (revision 2305) > However, we have some binaries (images) that were added in there, so I > am not sure the patch will handle them fine. Do you absolutely need a > patch? Or would it be ok if we gave you an updated tarball that we'd > call hwloc-1.0.2a1-20100712-2034 or whatever? I would in fact prefer this solution! > Obviously, if we release 1.0.2 very soon, it would be much easier for > you. We already have quite a lot of fixes queued in the 1.0 branch. I > added Jeff and Samuel to CC in case they have an opinion about it. It would be really great to have 1.0.2 released (or even 1.1 :-) ) however, I don't want to create any stress on you. I think hwloc-1.0.2a1-20100712-2034 would work best for me. Thanks! Jirka
