[Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Daniel Palmer]

Currently it's not possible to build strace on m68k when using
musl because the version of musl in buildroot doesn't have the
m68k specific definitions of POLLWRNORM and POLLWRBAND.

This is already fixed upstream so manually apply the patch
until the next release.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
---
 package/musl/0006-m68k-fix-poll.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/musl/0006-m68k-fix-poll.patch

diff --git a/package/musl/0006-m68k-fix-poll.patch b/package/musl/0006-m68k-fix-poll.patch
new file mode 100644
index 000000000000..45d5dcede459
--- /dev/null
+++ b/package/musl/0006-m68k-fix-poll.patch
@@ -0,0 +1,25 @@
+From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Wed, 7 Aug 2024 08:51:03 +0300
+Subject: m68k: fix POLLWRNORM and POLLWRBAND
+
+As noted in commit f5011c62c3 ("fix POLLWRNORM and POLLWRBAND on mips")
+m68k uses a different definition.
+---
+ arch/m68k/bits/poll.h | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 arch/m68k/bits/poll.h
+
+(limited to 'arch/m68k/bits/poll.h')
+
+diff --git a/arch/m68k/bits/poll.h b/arch/m68k/bits/poll.h
+new file mode 100644
+index 00000000..00063f41
+--- /dev/null
++++ b/arch/m68k/bits/poll.h
+@@ -0,0 +1,2 @@
++#define POLLWRNORM POLLOUT
++#define POLLWRBAND 256
+-- 
+cgit v1.2.1
+
-- 
2.47.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Baruch Siach via buildroot]

Hi Daniel,

On Tue, Mar 11 2025, Daniel Palmer wrote:
> Currently it's not possible to build strace on m68k when using
> musl because the version of musl in buildroot doesn't have the
> m68k specific definitions of POLLWRNORM and POLLWRBAND.
>
> This is already fixed upstream so manually apply the patch
> until the next release.

A link to autobuilder failure is missing:

  http://autobuild.buildroot.net/results/ec3de790a66373f270f731519e2ef51c293ba683/

> Signed-off-by: Daniel Palmer <daniel@0x0f.com>
> ---
>  package/musl/0006-m68k-fix-poll.patch | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>  create mode 100644 package/musl/0006-m68k-fix-poll.patch
>
> diff --git a/package/musl/0006-m68k-fix-poll.patch b/package/musl/0006-m68k-fix-poll.patch
> new file mode 100644
> index 000000000000..45d5dcede459
> --- /dev/null
> +++ b/package/musl/0006-m68k-fix-poll.patch
> @@ -0,0 +1,25 @@
> +From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001
> +From: Baruch Siach <baruch@tkos.co.il>
> +Date: Wed, 7 Aug 2024 08:51:03 +0300
> +Subject: m68k: fix POLLWRNORM and POLLWRBAND
> +
> +As noted in commit f5011c62c3 ("fix POLLWRNORM and POLLWRBAND on mips")
> +m68k uses a different definition.

You should add your sign-off and an upstream tags here.

See the manual:

  https://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches

> +---
> + arch/m68k/bits/poll.h | 2 ++
> + 1 file changed, 2 insertions(+)
> + create mode 100644 arch/m68k/bits/poll.h
> +
> +(limited to 'arch/m68k/bits/poll.h')

What is this comment meant to say?

baruch

> +
> +diff --git a/arch/m68k/bits/poll.h b/arch/m68k/bits/poll.h
> +new file mode 100644
> +index 00000000..00063f41
> +--- /dev/null
> ++++ b/arch/m68k/bits/poll.h
> +@@ -0,0 +1,2 @@
> ++#define POLLWRNORM POLLOUT
> ++#define POLLWRBAND 256
> +-- 
> +cgit v1.2.1
> +

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Daniel Palmer]

Hi Baruch,

On Tue, 11 Mar 2025 at 19:22, Baruch Siach <baruch@tkos.co.il> wrote:
>
> Hi Daniel,
>
> On Tue, Mar 11 2025, Daniel Palmer wrote:
> > Currently it's not possible to build strace on m68k when using
> > musl because the version of musl in buildroot doesn't have the
> > m68k specific definitions of POLLWRNORM and POLLWRBAND.
> >
> > This is already fixed upstream so manually apply the patch
> > until the next release.
>
> A link to autobuilder failure is missing:
>
>   http://autobuild.buildroot.net/results/ec3de790a66373f270f731519e2ef51c293ba683/

Interesting. I didn't know this had been spotted by the autobuilder. I
just noticed it while building strace to debug another package.

> > Signed-off-by: Daniel Palmer <daniel@0x0f.com>
> > ---
> >  package/musl/0006-m68k-fix-poll.patch | 25 +++++++++++++++++++++++++
> >  1 file changed, 25 insertions(+)
> >  create mode 100644 package/musl/0006-m68k-fix-poll.patch
> >
> > diff --git a/package/musl/0006-m68k-fix-poll.patch b/package/musl/0006-m68k-fix-poll.patch
> > new file mode 100644
> > index 000000000000..45d5dcede459
> > --- /dev/null
> > +++ b/package/musl/0006-m68k-fix-poll.patch
> > @@ -0,0 +1,25 @@
> > +From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001
> > +From: Baruch Siach <baruch@tkos.co.il>
> > +Date: Wed, 7 Aug 2024 08:51:03 +0300
> > +Subject: m68k: fix POLLWRNORM and POLLWRBAND
> > +
> > +As noted in commit f5011c62c3 ("fix POLLWRNORM and POLLWRBAND on mips")
> > +m68k uses a different definition.
>
> You should add your sign-off and an upstream tags here.
>
> See the manual:
>
>   https://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches

Ok, I'll look into that and resend.

Thanks,

Daniel
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Peter Korsgaard]

>>>>> "Daniel" == Daniel Palmer <daniel@0x0f.com> writes:

Hi,

 >> You should add your sign-off and an upstream tags here.
 >> 
 >> See the manual:
 >> 
 >> https://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches

 > Ok, I'll look into that and resend.

I took the liberty to fix these things up myself (including your s-o-b)
and applied as I would like to release -rc2 today.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Daniel Palmer]

Hi Peter,

On Thu, 13 Mar 2025 at 03:15, Peter Korsgaard <peter@korsgaard.com> wrote:
> I took the liberty to fix these things up myself (including your s-o-b)
> and applied as I would like to release -rc2 today.

Thanks!
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/musl: Add upstream patch to fix building strace on m68k

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Daniel" == Daniel Palmer <daniel@0x0f.com> writes:
 > Hi,

 >>> You should add your sign-off and an upstream tags here.
 >>> 
 >>> See the manual:
 >>> 
 >>> https://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches

 >> Ok, I'll look into that and resend.

 > I took the liberty to fix these things up myself (including your s-o-b)
 > and applied as I would like to release -rc2 today.

Committed to 2024.02.x and 2024.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot