WAF 2.x upgrade for 4.10

Alexander Bokovoy ab at samba.org
Thu Sep 6 10:47:02 UTC 2018

On to, 06 syys 2018, Noel Power wrote:
> So, first I forgot already to express my congrats for the excellent
> achievement of getting the WAF 2.x upgrade in, well done!!
Thank you! This is really a cooperative effort from multiple people
where I only worked as a custodian for such a long time.
> Also seems the patch set that Metz rebased no longer works (for pure
> python3),  configure fails for me, I guess some more non-py3 compliant
> code has snuck in since I tried last time, also the branch associated
> with Metze's posted pipeline contains even more patches than I
> remembered, these extra ones I guess are from the now rather stale
> https://gitlab.com/samba-team/devel/samba/commits/npower-uber-waf2-plus-py3-porting
> which has lots of not signed off and WIP patches. I will try and strip
> this down into something minimal that will allow to do a basic
> configure/build under python3 and submit that.
> I really need to update that WIP pure branch too (I have even more WIP
> patches locally :-() Hehe my patch juggling skills are pretty crap, I am
> constantly switching between too many branches :-) but... I really need
> to push my current WIP pure python3 stuff rebased against the latest
> master (which has lots more ported tests) I think we are getting very
> close though to the end of the ported test patches, that's the good
> news, the bad news is that much more problems will be uncovered when
> trying to get the tests to run under pure python3 :-) The challenge
> continues
One approach I took is by playing between 
  git branch -l new-branch master
  git format-patch -o ~/todo/samba/some-directory master..HEAD

The latter will export patches as files so you can do mix-and-match with
individual 'git am ~/todo/samba/some-directory/???-patch-desc.patch' in
a separate branch. This allows you to be more flexible with what moves
around and also have a backup.

Another option is to use 'git cherry-pick' from one working branch to
another. This will fail a bit when you do 'git rebase -i' since for any
fixed up or merged patch you'd get different commit IDs but that at
least can help to move things around branches more easily.

As to the problems, yes, they will pop up as we get more and more
coverage for py3 code. I got the same problem with FreeBSD 11.2 where I
started with things not working at all and gradually moved to
https://gitlab.com/samba-team/samba/merge_requests/67 which compiles
and links fully for heimdal-based AD DC (with py2 right now).

> Anyway I'll have a look, hopefully by the end of today or maybe tomorrow
> I should have a patch set that allows configure/build at least under python3
Looking forward to that!

Thank you in advance, Noel!

> Noel
> On 05/09/18 12:40, Alexander Bokovoy wrote:
> > On ke, 05 syys 2018, Stefan Metzmacher wrote:
> >> Hi Noel,
> >>
> >> I just rebased your code on master and a pipeline is running here:
> >> https://gitlab.com/samba-team/devel/samba/pipelines/29453956
> > Yes, fixes from Noel are needed. I didn't look into fixing py3 issues
> > because Noel already had them so now that we are unblocked on waf
> > upgrade, integrating Noel's patches is the next step.
> >
> >

/ Alexander Bokovoy

More information about the samba-technical mailing list