[Buildroot] [PATCH 1/2] package/igh-ethercat: bump to latest Git commit

[Buildroot] [PATCH 1/2] package/igh-ethercat: bump to latest Git commit

[Thomas Petazzoni via buildroot]

The current version 1.5.2 dates back from 2013, so it is extremely
old. The latest master branch of igh-ethercat contains numerous fixes,
including fixes to ensure that it builds with recent Linux kernel
releases. Backporting the individual patches fixing those issues on a
9 year old release would be too much effort, so we propose to simply
bump the version to the latest available in the Git master branch.

Fixes:

  http://autobuild.buildroot.net/results/4dc9b71c805a8156bcf8f398edd3a30f2b6ac6da/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/igh-ethercat/igh-ethercat.hash |  3 +--
 package/igh-ethercat/igh-ethercat.mk   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash
index c77627ee56..88548bf23e 100644
--- a/package/igh-ethercat/igh-ethercat.hash
+++ b/package/igh-ethercat/igh-ethercat.hash
@@ -1,5 +1,4 @@
-# From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5
-md5  6b4001f8d975865d74a0b108b3bdda3d  ethercat-1.5.2.tar.bz2
 # Locally computed
+sha256  eb13a0f7f073ad54589c4f41829d9e995b37b26fbc7fcd05e3adb5e201e6feb4  igh-ethercat-2e2cef6131895336f87c57c18fe78ae01a90d3de.tar.gz
 sha256  231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LESSER
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index 9fcfb4f6f2..1041ba0758 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-IGH_ETHERCAT_VERSION = 1.5.2
-IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
-IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
+IGH_ETHERCAT_VERSION = 2e2cef6131895336f87c57c18fe78ae01a90d3de
+IGH_ETHERCAT_SITE = $(call gitlab,etherlab.org,ethercat,$(IGH_ETHERCAT_VERSION))
 IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries)
 IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
+# Fetching from Git
+IGH_ETHERCAT_AUTORECONF = YES
 
 IGH_ETHERCAT_INSTALL_STAGING = YES
 
@@ -21,5 +22,11 @@ IGH_ETHERCAT_CONF_OPTS = \
 	$(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) \
 	$(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169)
 
+# Needed to make autoreconf happy
+define IGH_ETHERCAT_CREATE_CHANGELOG
+	touch $(@D)/ChangeLog
+endef
+IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG
+
 $(eval $(kernel-module))
 $(eval $(autotools-package))
-- 
2.38.1

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

[Buildroot] [PATCH 2/2] utils/genrandconfig: don't build igh-ethercat drivers

[Thomas Petazzoni via buildroot]

igh-ethercat comes with a small number of patched Linux kernel network
drivers, which aim at replacing the ones available in upstream Linux
kernel. All those drivers are provided only for specific kernel
releases. For example:

r8169-2.6.24-ethercat.c
r8169-2.6.24-orig.c
r8169-2.6.27-ethercat.c
r8169-2.6.27-orig.c
r8169-2.6.28-ethercat.c
r8169-2.6.28-orig.c
r8169-2.6.29-ethercat.c
r8169-2.6.29-orig.c
r8169-2.6.31-ethercat.c
r8169-2.6.31-orig.c
r8169-2.6.32-ethercat.c
r8169-2.6.32-orig.c
r8169-2.6.33-ethercat.c
r8169-2.6.33-orig.c
r8169-2.6.35-ethercat.c
r8169-2.6.35-orig.c
r8169-2.6.36-ethercat.c
r8169-2.6.36-orig.c
r8169-2.6.37-ethercat.c
r8169-2.6.37-orig.c
r8169-3.10-ethercat.c
r8169-3.10-orig.c
r8169-3.12-ethercat.c
r8169-3.12-orig.c
r8169-3.14-ethercat.c
r8169-3.14-orig.c
r8169-3.16-ethercat.c
r8169-3.16-orig.c
r8169-3.2-ethercat.c
r8169-3.2-orig.c
r8169-3.4-ethercat.c
r8169-3.4-orig.c
r8169-3.6-ethercat.c
r8169-3.6-orig.c
r8169-3.8-ethercat.c
r8169-3.8-orig.c
r8169-4.4-ethercat.c
r8169-4.4-orig.c

Obviously, this doesn't play well with the random configuration
testing done by utils/genrandconfig. This commit avoids this issue by
making sure we never build any of those drivers as part of the
genrandconfig generated configurations.

Fixes:

  http://autobuild.buildroot.net/results/07b7475d780c067d99ee5618a5fd2bb024a5b4e7/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 utils/genrandconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/genrandconfig b/utils/genrandconfig
index 9c6c2b359c..eccd3a228e 100755
--- a/utils/genrandconfig
+++ b/utils/genrandconfig
@@ -629,6 +629,13 @@ def fixup_config(sysinfo, configfile):
         configlines.append('BR2_PACKAGE_XVISOR_USE_DEFCONFIG=y\n')
         configlines.remove('BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n')
 
+    # Don't build igh-ethercat driver as they are highly
+    # kernel-version specific
+    for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169']:
+        optstr = 'BR2_PACKAGE_IGH_ETHERCAT_%s=y\n' % opt
+        if optstr in configlines:
+            configlines.remove(optstr)
+
     with open(configfile, "w+") as configf:
         configf.writelines(configlines)
 
-- 
2.38.1

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

Re: [Buildroot] [PATCH 1/2] package/igh-ethercat: bump to latest Git commit

[Thomas Petazzoni via buildroot]

On Wed, 16 Nov 2022 22:21:04 +0100
Thomas Petazzoni via buildroot <buildroot@buildroot.org> wrote:

> The current version 1.5.2 dates back from 2013, so it is extremely
> old. The latest master branch of igh-ethercat contains numerous fixes,
> including fixes to ensure that it builds with recent Linux kernel
> releases. Backporting the individual patches fixing those issues on a
> 9 year old release would be too much effort, so we propose to simply
> bump the version to the latest available in the Git master branch.
> 
> Fixes:
> 
>   http://autobuild.buildroot.net/results/4dc9b71c805a8156bcf8f398edd3a30f2b6ac6da/
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/igh-ethercat/igh-ethercat.hash |  3 +--
>  package/igh-ethercat/igh-ethercat.mk   | 13 ++++++++++---
>  2 files changed, 11 insertions(+), 5 deletions(-)

Series applied to master.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] utils/genrandconfig: don't build igh-ethercat drivers

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes:

 > igh-ethercat comes with a small number of patched Linux kernel network
 > drivers, which aim at replacing the ones available in upstream Linux
 > kernel. All those drivers are provided only for specific kernel
 > releases. For example:

 > r8169-2.6.24-ethercat.c
 > r8169-2.6.24-orig.c
 > r8169-2.6.27-ethercat.c
 > r8169-2.6.27-orig.c
 > r8169-2.6.28-ethercat.c
 > r8169-2.6.28-orig.c
 > r8169-2.6.29-ethercat.c
 > r8169-2.6.29-orig.c
 > r8169-2.6.31-ethercat.c
 > r8169-2.6.31-orig.c
 > r8169-2.6.32-ethercat.c
 > r8169-2.6.32-orig.c
 > r8169-2.6.33-ethercat.c
 > r8169-2.6.33-orig.c
 > r8169-2.6.35-ethercat.c
 > r8169-2.6.35-orig.c
 > r8169-2.6.36-ethercat.c
 > r8169-2.6.36-orig.c
 > r8169-2.6.37-ethercat.c
 > r8169-2.6.37-orig.c
 > r8169-3.10-ethercat.c
 > r8169-3.10-orig.c
 > r8169-3.12-ethercat.c
 > r8169-3.12-orig.c
 > r8169-3.14-ethercat.c
 > r8169-3.14-orig.c
 > r8169-3.16-ethercat.c
 > r8169-3.16-orig.c
 > r8169-3.2-ethercat.c
 > r8169-3.2-orig.c
 > r8169-3.4-ethercat.c
 > r8169-3.4-orig.c
 > r8169-3.6-ethercat.c
 > r8169-3.6-orig.c
 > r8169-3.8-ethercat.c
 > r8169-3.8-orig.c
 > r8169-4.4-ethercat.c
 > r8169-4.4-orig.c

 > Obviously, this doesn't play well with the random configuration
 > testing done by utils/genrandconfig. This commit avoids this issue by
 > making sure we never build any of those drivers as part of the
 > genrandconfig generated configurations.

 > Fixes:

 >   http://autobuild.buildroot.net/results/07b7475d780c067d99ee5618a5fd2bb024a5b4e7/

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2022.08.x, thanks.

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