On Wed, Jun 06, 2012 at 05:03:00PM +0200, Helmut Hullen wrote: > Hallo, Hugo, > > Du meintest am 06.06.12: > > > However, the third line with the problem looks like something out of > > date. Possibly a mis-merge? > > Where should I search?
Well, the first thing would be to try a completely new clone of the repo, then git co integration-20120605, and run make again. If that's OK, then take a look with gitk in the broken repo and see what kind of history you've got in there -- it should be a single unbroken sequence from "master" (1957076ab4fefa47b6efed3da541bc974c83eed7) to "integration-20120605" (d4c539067d1cb2476c7fb6003625de26e84059af). Also have a look in the Makefile of the broken repo -- all of the commands (listed near the top, assigned to the "progs" variable) should start with "btrfs", and there should be no rule for "convert" in there. Again, if that's not the case, you've managed to mis-merge or check out the wrong branch. Hugo. -- === Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk === PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk --- We are all lying in the gutter, but some of us are looking --- at the stars.
signature.asc
Description: Digital signature
