| Message ID | 20240522070238.3282121-12-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series | apply patches with fuzz factor 0 | expand |
Hi Dario, On Wed, May 22 2024, Dario Binacchi wrote: > This commit allows the package patch to be applied with fuzz factor 0. > The fuzz factor specifies how many lines of the patch can be inexactly > matched, so the value 0 requires all lines to be exactly matched. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch > index 57d1c8747dea..4c833cfb22bc 100644 > --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch > +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch > @@ -1,4 +1,4 @@ > -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001 > +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001 > From: Baruch Siach <baruch@tkos.co.il> > Date: Sun, 12 Mar 2017 08:52:20 +0200 > Subject: [PATCH] Add musl workaround to the libc-compat.h copy > @@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch > package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch. > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > ---- > -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper > -musl fix must go to the kernel first. > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> I think this patch is not needed anymore since libnl version 3.5.0. I have not tested though. baruch > --- > include/linux-private/linux/libc-compat.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h > -index 9bed5b6ae4d9..e2562a819464 100644 > +index a1599911e7a9..f6df7193b8b4 100644 > --- a/include/linux-private/linux/libc-compat.h > +++ b/include/linux-private/linux/libc-compat.h > -@@ -49,7 +49,7 @@ > +@@ -50,7 +50,7 @@ > #define _LIBC_COMPAT_H > > /* We have included glibc headers... */ > -#if defined(__GLIBC__) > +#if 1 > > - /* Coordinate with glibc netinet/in.h header. */ > - #if defined(_NETINET_IN_H) > + /* Coordinate with glibc net/if.h header. */ > + #if defined(_NET_IF_H) && defined(__USE_MISC) > -- > -2.11.0 > +2.43.0
diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch index 57d1c8747dea..4c833cfb22bc 100644 --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch @@ -1,4 +1,4 @@ -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001 +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001 From: Baruch Siach <baruch@tkos.co.il> Date: Sun, 12 Mar 2017 08:52:20 +0200 Subject: [PATCH] Add musl workaround to the libc-compat.h copy @@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch. Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper -musl fix must go to the kernel first. +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- include/linux-private/linux/libc-compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h -index 9bed5b6ae4d9..e2562a819464 100644 +index a1599911e7a9..f6df7193b8b4 100644 --- a/include/linux-private/linux/libc-compat.h +++ b/include/linux-private/linux/libc-compat.h -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ -#if defined(__GLIBC__) +#if 1 - /* Coordinate with glibc netinet/in.h header. */ - #if defined(_NETINET_IN_H) + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) -- -2.11.0 +2.43.0
This commit allows the package patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)