[Buildroot] [git commit] package/igh-ethercat: remove stale patch 0002

[Buildroot] [git commit] package/igh-ethercat: remove stale patch 0002

[Julien Olivain via buildroot]

commit: https://gitlab.com/buildroot.org/buildroot/-/commit/d0718179694b407cb93f1603cdf845997dac7345
branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master

igh-ethercat is failing while attempting to apply patches,
with error:

    Applying 0002-Linux-6.19.0-support.patch using patch:
    patching file devices/generic.c
    Reversed (or previously applied) patch detected!  Skipping patch.
    1 out of 1 hunk ignored -- saving rejects to file devices/generic.c.rej

The package patch 0002 was added in [1] in branch "master" while it
was in release client cycle. It was cherry-picked in [2] in branch
"next" to apply the bump [3] (which removes the package patches 0001
and 0002). When the branch "next" was merged in "master" in commit [4],
the patch 0002 was kept.

This commit removes this stale patch.

[1] https://gitlab.com/buildroot.org/buildroot/-/commit/e4cf512c394f218cc71eb6b496ce4cb004c917bb
[2] https://gitlab.com/buildroot.org/buildroot/-/commit/8a5fc970b48a432f5df3be1f1e7667095e712b3d
[3] https://gitlab.com/buildroot.org/buildroot/-/commit/0a91e760f467a90b0f0acf00ec76aac011b241f1
[4] https://gitlab.com/buildroot.org/buildroot/-/commit/5f2687795595c9af579312c1d504373ece56f43f

Fixes:
- https://autobuild.buildroot.org/results/4f509f1f788c1b8dc5a840ffa2e435c5ed7b6eea/

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .../igh-ethercat/0002-Linux-6.19.0-support.patch   | 36 ----------------------
 1 file changed, 36 deletions(-)

diff --git a/package/igh-ethercat/0002-Linux-6.19.0-support.patch b/package/igh-ethercat/0002-Linux-6.19.0-support.patch
deleted file mode 100644
index 6a6af5508c..0000000000
--- a/package/igh-ethercat/0002-Linux-6.19.0-support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2c947e90d93d9c5a0129b62744de9720b48d2a17 Mon Sep 17 00:00:00 2001
-From: Nicola Fontana <ntd@entidi.it>
-Date: Sun, 8 Mar 2026 15:39:41 +0100
-Subject: [PATCH] Linux 6.19.0 support
-
-Commit 89aec171d9d1ab168e43fcf9754b82e4c0aef9b9 (part of linux kernel
-6.19.0-rc1) introduced an arbitrarily sized sockaddr struct to be used
-instead of the classical one.
-
-Closes #200
-
-Upstream: https://gitlab.com/etherlab.org/ethercat/-/commit/c42c9cf8bc31c56cc20ae630605495e3f19f3f9a
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- devices/generic.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/devices/generic.c b/devices/generic.c
-index f6cef9b5..a08af54b 100644
---- a/devices/generic.c
-+++ b/devices/generic.c
-@@ -234,7 +234,11 @@ int ec_gen_device_create_socket(
-     sa.sll_family = AF_PACKET;
-     sa.sll_protocol = htons(ETH_P_ETHERCAT);
-     sa.sll_ifindex = desc->ifindex;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
-+    ret = kernel_bind(dev->socket, (struct sockaddr_unsized *) &sa, sizeof(sa));
-+#else
-     ret = kernel_bind(dev->socket, (struct sockaddr *) &sa, sizeof(sa));
-+#endif
-     if (ret) {
-         printk(KERN_ERR PFX "Failed to bind() socket to interface"
-                 " (ret = %i).\n", ret);
--- 
-2.55.0
-
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/igh-ethercat: remove stale patch 0002

[Peter Korsgaard]

>>>>> "Julien" == Julien Olivain via buildroot <buildroot@buildroot.org> writes:

 > commit: https://gitlab.com/buildroot.org/buildroot/-/commit/d0718179694b407cb93f1603cdf845997dac7345
 > branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master

 > igh-ethercat is failing while attempting to apply patches,
 > with error:

 >     Applying 0002-Linux-6.19.0-support.patch using patch:
 >     patching file devices/generic.c
 >     Reversed (or previously applied) patch detected!  Skipping patch.
 >     1 out of 1 hunk ignored -- saving rejects to file devices/generic.c.rej

 > The package patch 0002 was added in [1] in branch "master" while it
 > was in release client cycle. It was cherry-picked in [2] in branch
 > "next" to apply the bump [3] (which removes the package patches 0001
 > and 0002). When the branch "next" was merged in "master" in commit [4],
 > the patch 0002 was kept.

 > This commit removes this stale patch.

 > [1] https://gitlab.com/buildroot.org/buildroot/-/commit/e4cf512c394f218cc71eb6b496ce4cb004c917bb
 > [2] https://gitlab.com/buildroot.org/buildroot/-/commit/8a5fc970b48a432f5df3be1f1e7667095e712b3d
 > [3] https://gitlab.com/buildroot.org/buildroot/-/commit/0a91e760f467a90b0f0acf00ec76aac011b241f1
 > [4] https://gitlab.com/buildroot.org/buildroot/-/commit/5f2687795595c9af579312c1d504373ece56f43f

 > Fixes:
 > - https://autobuild.buildroot.org/results/4f509f1f788c1b8dc5a840ffa2e435c5ed7b6eea/

Ups, thanks for fixing it!

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