Submodule improvements

Jelmer Vernooij jelmer at samba.org
Sun May 24 09:48:32 MDT 2015


On Thu, May 21, 2015 at 02:45:48PM +0200, Andrew Bartlett wrote:
> On Mon, 2015-05-18 at 20:23 +0000, Jelmer Vernooij wrote:
> > This patchset improves our handling of submodules in our build system,
> > by preventing developers build with outdated submodules if there are
> > any present. This should hopefully address the concerns that Andrew
> > raised in the last thread.
> > 
> > While I was there, I also removed support for running Samba from a
> > bzr repository rather than Git. I'm pretty sure I was the only who
> > ever used that.
> 
> Thanks Jelmer,
> 
> I've pushed those with my review and then looked with metze to see what
> we could do to make this work.  He can speak for himself, but when
> demonstrating his concerns to me the major issue that he hit was the
> boundary conditions when moving back and forth (such as in a rebase)
> over the boundary where a submodule is put into use, with untracked
> files appearing.  
That should be a temporary issue while we migrate; once we have it's
only a minor nuisance (you have to rm -rf third_party/dnspython before
switching to an old branch).

As a workaround, we could add the submodule in a different path
than where the original code used to live so they don't conflict. E.g.
bundled/dnspython rather than third_party/dnspython.

> We did however show that the issues around initialisation of the
> submoudle git modules could be handled fairly well by the fact that
> submodule objects live in the .git directory, or a helper script for the
> original git clone/fetch.
What specifically doesn't work there that isn't handled by
--recursive?

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - https://jelmer.uk/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150524/0a7e9dbb/attachment.pgp>


More information about the samba-technical mailing list