[PATCH] waf: Fix the build on openbsd
Volker.Lendecke at SerNet.DE
Mon Feb 9 06:59:29 MST 2015
On Mon, Feb 09, 2015 at 02:43:31PM +0100, Jelmer Vernooij wrote:
> On Mon, Feb 09, 2015 at 02:09:17PM +0100, Volker Lendecke wrote:
> > On Mon, Feb 09, 2015 at 12:41:56PM +0100, Ralph Böhme wrote:
> > > Subject: [PATCH 1/2] waf: add new file for wafadmin bugfixes
> > >
> > > In order to facilitate differentation between
> > >
> > > 1) pristine upstream waf in wafadmin
> > > 2) backported upstream commits/bugfixes in wafadmin
> > > 3) downstream bugfixes
> > >
> > > add a new file samba_wafadmin_fixes.py which is restricted to only
> > > containing pure wafadmin bugfixes.
> > Why this is necessary? It is very easy in git to look at the diff to
> > upstream waf in the copied buildtools/wafadmin subdirectory.
> Every time we import a new copy of upstream waf (see buildtools/update-waf.sh),
update-waf.sh should not be set in stone. What you could do is to do
a git revert of all changes in wafadmin, then possibly import the new
waf and revert the reverts again. This way you have full track of the
changes and can see possible conflicts.
> we lose all Samba-specific changes. Changes that are generic enough
> to go into wafadmin/ should really go upstream, so we can pull them down
> from there.
My understanding is that going through upstream is not an option for us
because we're far too backlevel, and as Ralph has pointed out upstream
is not very open to changes from us.
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
More information about the samba-technical