From: Maarten ter Huurne <maarten@treewalker.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3] rpi-userland: bump revision for musl compile fixes
Date: Sat, 18 Oct 2014 14:15:54 +0200 [thread overview]
Message-ID: <1491715.MQnf8L3yFy@hyperion> (raw)
In-Reply-To: <20141018113446.GA31723@free.fr>
On Saturday 18 October 2014 13:34:46 Yann E. MORIN wrote:
> Maarten, All,
>
> On 2014-10-18 13:05 +0200, Yann E. MORIN spake thusly:
> > On 2014-10-17 17:57 +0200, Maarten ter Huurne spake thusly:
> > > Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
> > > ---
> > > The second version of this patch was missing the "v2" label; this is
> > > the third version.
> > >
> > > The changes from v2, plus an additional change I made later were
> > > merged
> > > upstream. This patch bumps the git revision to the merge commit.
> > >
> > > rpi-userland-002-remove-faulty-assert.patch had to be updated to match
> > > other changes in the code that are pulled in by the version bump.
> > > I checked that the updated patch compiles fine, but I have no idea
> > > whether it is still needed to fix or work around a runtime problem.
> >
> > So, I have tested this bump: weston on the rpi no longer works, with or
> > without the asser patch.
> >
> > So, I NAK this bump for now.
> >
> > I'll see to bisect rpi-userland to see where it breaks.
>
> The culprit is:
> 66338d3 vc_dispmanx: Fix vsync service use counting
>
> Unfortunately, weston has yet no fix for that, and I could not spot any
> fix for rpi-userland either... :-/
That commit is less than a week old; rpi-userland might not be aware of the
problem. Will you or the Weston devs file a bug for it or alert the author?
By the way, 66338d3 is the commit that gives a NULL handle a special
meaning. If the assert no longer triggers, perhaps the assert used to
trigger on the handle being NULL by accident?
> So, still NAK for this bump. We can still bump it up to ba753c1 as this
> still works, but is not enough to get the musl fixes.
>
> Maybe we could just hide it for musl for now?
I think it would be a pity to hide it when we have a fix for the musl
compile problem.
The only differences between the the proposed bump (4333d6d) and the last
working version (ba753c1) are the commit that breaks Weston (66338d3) and
the musl compile fixes. So I could create a v4 patch which bumps the version
to 4333d6d and contains a patch to revert 66338d3.
Alternatively, I could create a v4 patch which bumps the version to ba753c1
and adds the musl compile fixes as separate patches. While the number of
patches would be greater (5 vs 1), the number of changed lines would be
smaller, since most of the compile fixes change one line each.
Or I could create a v4 patch which bumps the version to ba753c1 and adds the
musl compile fixes as a single patch. Since we know they have been accepted
upstream in the same merge commit (4333d6d), we can drop all of them at the
same time once we can safely bump beyond that merge commit.
At the moment I prefer bumping to ba753c1 + squashed musl compile fixes, but
I'd like a second opinion.
Bye,
Maarten
next prev parent reply other threads:[~2014-10-18 12:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 1:45 [Buildroot] [PATCH] rpi-userland: Add patches to fix compilation with musl libc Maarten ter Huurne
2014-09-12 7:32 ` Thomas Petazzoni
2014-09-12 14:56 ` Maarten ter Huurne
2014-09-12 15:11 ` Thomas Petazzoni
2014-09-12 17:01 ` Maarten ter Huurne
2014-10-17 15:57 ` [Buildroot] [PATCH v3] rpi-userland: bump revision for musl compile fixes Maarten ter Huurne
2014-10-17 20:31 ` Yann E. MORIN
2014-10-18 11:05 ` Yann E. MORIN
2014-10-18 11:34 ` Yann E. MORIN
2014-10-18 12:15 ` Maarten ter Huurne [this message]
2014-10-18 13:02 ` Yann E. MORIN
2014-10-18 16:46 ` Maarten ter Huurne
2014-10-18 17:16 ` Yann E. MORIN
2014-10-18 17:22 ` Maarten ter Huurne
2014-10-18 17:58 ` [Buildroot] [PATCH v4] rpi-userland: bump revision and add patch to fix compile with musl Maarten ter Huurne
2014-10-19 10:32 ` Yann E. MORIN
2014-10-19 14:37 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491715.MQnf8L3yFy@hyperion \
--to=maarten@treewalker.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.