Commit Graph

2373 Commits

Author SHA1 Message Date
Nicola Fontana 4c8ffd9a57 Do not hardcode paths in scripts
Try to reuse the configured paths as much as possible. Unfortunately, to
be able to fully expand some variable (e.g. `bindir`), these files must
be expanded by make, not by configure. This adds some complexity:

https://www.gnu.org/software/automake/manual/html_node/Scripts.html
2021-07-22 14:40:03 +02:00
Florian Pose 673e50e692 Merge branch 'igb-4.19-drivers' into 'stable-1.5'
igb-4.19 kernel driver

See merge request etherlab.org/ethercat!24
2021-07-06 14:13:00 +00:00
Florian Pose 5e21dcd6e1 Added 4.19 files to Makefile. 2021-07-06 16:11:04 +02:00
Vincenzo Ferraro 260ae28310 igb-4.19 kernel driver 2021-07-06 16:11:04 +02:00
Florian Pose 1846af4995 Merge branch 'fix/runShellcheckOnScriptFolder' into 'stable-1.5'
script: run shellcheck on bash / sh scripts

See merge request etherlab.org/ethercat!26
2021-07-05 15:09:27 +00:00
Matthias Schoepfer 66329e1fe1 script: run shellcheck on bash / sh scripts
Mostly fixed omitted double quotes, some conversion of $(eval ..) to $(()).
Left the echo -n untouched, shellcheck complains about not being standard in
/bin/sh. Also, seems like some code is dublicated in ethercatctl.in and
init.d/ethercat.in.

Signed-off-by: Matthias Schoepfer <m.schoepfer@rethinkrobotics.com>
2021-07-05 14:51:16 +02:00
Vincenzo Ferraro 699217edda igb-4.19 kernel driver 2021-07-02 12:47:29 +00:00
Florian Pose cefb37944d Added some options to widen test coverage. 2021-07-01 11:43:12 +00:00
Florian Pose 66d3f3f95c Merge branch 'tty-dev' into 'stable-1.5'
Implement fix for kernel error when opening TTY device file on kernel 3.7.0 or greater

Fix for issue described in #8 

See merge request etherlab.org/ethercat!22
2021-07-01 11:34:21 +00:00
Kale Yuzik abdefcedf2 Implement fix for kernel error when opening TTY device file on kernel 3.7.0 or greater
Error message: "tty_init_dev: ttyEC driver does not set tty->port. This would crash the kernel. Fix the driver!"
2021-06-30 08:48:54 -06:00
Florian Pose f87df53bb7 Merge branch 'fix-make-distclean' into 'stable-1.5'
Revive 'make distcheck'

See merge request etherlab.org/ethercat!20
2021-06-22 14:43:07 +00:00
Nicola Fontana 82399a9239 Revive 'make distcheck' 2021-06-22 14:43:07 +00:00
Florian Pose a9bdd8e41a Merge branch 'ci_container' into 'stable-1.5'
switch to prebuilt container

See merge request etherlab.org/ethercat!21
2021-06-18 16:14:47 +00:00
Bjarne von Horn 341e5d8a38 switch to prebuilt container 2021-06-18 16:00:29 +02:00
Florian Pose 1fa5565aa0 Ignore cmake output. 2021-06-09 13:56:01 +02:00
Florian Pose 491bc99f95 Merge branch 'add_cmake_helper' into 'stable-1.5'
Add cmake config module

See merge request etherlab.org/ethercat!19
2021-06-09 11:49:01 +00:00
Bjarne von Horn a0ba01ae74 Add cmake config module 2021-06-09 11:49:01 +00:00
Florian Pose bd0612d6aa Merge branch 'fix-m4-Makefile' into 'stable-1.5'
Remove empty m4/Makefile.am

See merge request etherlab.org/ethercat!17
2021-06-07 12:56:48 +00:00
Nicola Fontana d23b8ae258 Remove empty m4/Makefile.am 2021-06-07 14:42:43 +02:00
Florian Pose 72d7469857 Merge branch 'fix-make-distclean' into 'stable-1.5'
Fix #5: call Kbuild clean only where needed

Closes #5

See merge request etherlab.org/ethercat!16
2021-06-04 08:42:59 +00:00
Florian Pose 81cdcb0ec8 Merge branch 'dist-subdirs' into 'stable-1.5'
More autotools cleanups

See merge request etherlab.org/ethercat!15
2021-06-04 08:41:39 +00:00
Florian Pose 81f7c042e2 Merge branch 'test-rescan-fix' into 'stable-1.5'
Retry responding slaves datagram; more robust to timeouts.

See merge request etherlab.org/ethercat!18
2021-06-04 08:38:28 +00:00
Florian Pose 94f2fa860f Retry responding slaves datagram; more robust to timeouts. 2021-06-01 16:53:06 +02:00
Nicola Fontana 908b93f004 Fix #5: call Kbuild clean only where needed
The problem is both automake and kbuild recurse into subdirectories. In
`make distcheck`, automake cleans its `SUBDIRS` and only then tries to
clean the toplevel one. This in turn will trigger a kbuild clean that
will try to recurse into its own (now empty) subdirectories.

Avoid this issue by removing Kbuild clean from the toplevel.
2021-05-30 09:49:17 +02:00
Nicola Fontana 205337fed1 Do not define DIST_SUBDIRS when not needed
DIST_SUBDIRS is automatically populated with all possible values of
SUBDIRS in all conditions:

    https://www.gnu.org/software/automake/manual/html_node/SUBDIRS-vs-DIST_005fSUBDIRS.html

This means it is usually not needed to explicitely set it but in
examples/, where some dirs are never added to SUBDIRS.
2021-05-26 09:18:06 +02:00
Nicola Fontana 6c6dccc378 Disable 8139too in distcheck
The 8139too native driver was enabled by default for historical reasons.
Disable it in `make distcheck` to avoid needing to have a specific linux
source tree ready available.
2021-05-25 20:14:09 +02:00
Florian Pose 6d37c445ab Merge branch 'fix-e1000e-extra-dist' into 'stable-1.5'
Fix EXTRA_DIST files for e1000e

See merge request etherlab.org/ethercat!14
2021-05-25 10:47:37 +00:00
Florian Pose 9abf331414 Merge branch 'entidi/ethercat-remove-sram-gpio-from-dist' into stable-1.5 2021-05-25 12:46:54 +02:00
Florian Pose 0f6e2e19ec Merge branch 'stable-1.5' into 'remove-sram-gpio-from-dist'
# Conflicts:
#   devices/ccat/Makefile.am
2021-05-25 10:43:53 +00:00
Florian Pose 7dd06f87c1 Merge branch 'entidi/ethercat-fix-built-sources' into stable-1.5 2021-05-25 12:26:09 +02:00
Florian Pose 77d9cb32ce Docs: UTF-8 encoding; latest komascript packages. 2021-05-25 11:56:00 +02:00
Florian Pose 4164e10ccd Merge branch 'entidi/ethercat-proper-systemd-support' into stable-1.5 2021-05-25 11:39:48 +02:00
Florian Pose 301f3e34b1 Added systemd directory switch to docs. 2021-05-25 11:37:52 +02:00
Nicola Fontana b2b34133b8 Fix EXTRA_DIST files for e1000e
In `devices/e1000e/Makefile.am` there was a really sneaky double
backslash that messed up the whole EXTRA_DIST list.
2021-05-22 20:14:11 +02:00
Nicola Fontana 9da3b1ab40 Fix #4: remove sram.h and gpio.h from EXTRA_DIST
`sram.h` is not referenced anywhere (or, better, `grep -ir sram.h` does
not return any matching result) while `gpio.h` is included with
`<linux/gpio.h>`, suggesting the system header file is used.
2021-05-22 11:57:39 +02:00
Nicola Fontana 60dd78485c Do not include AC_CONFIG_FILES in BUILT_SOURCES
BUILT_SOURCES is used to trigger early generation of files in the `make`
process to workaround dependency problems:

    https://www.gnu.org/software/automake/manual/html_node/Sources.html

AC_CONFIG_FILES are generated by `configure`, so they are already
present in the file system even before `make` is called. Furthermore,
AC_CONFIG_FILES already properly handle dist and clean targets, so no
need to add them to EXTRA_DIST or DISTCLEANFILES:

    https://www.gnu.org/software/automake/manual/html_node/Requirements.html
2021-05-22 08:25:26 +02:00
Nicola Fontana 2a5529a8e9 Ignore generated libethercat.pc in git 2021-05-22 07:46:59 +02:00
Nicola Fontana 1d65f6617f Proper systemd support
Follow the directions on integrating systemd with autotools provided by
the systemd documentation itself:

https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files

The snippet has been adapted to better match our coding style, e.g.
directly use of `if` instead of `AS_IF`.
2021-05-22 07:22:57 +02:00
Florian Pose c6a4c99854 Fixed format string in tty example. 2021-05-06 12:00:35 +02:00
Florian Pose 779437feef Merge branch 'translate-to-french' into 'stable-1.5'
documentation: add French translation

See merge request etherlab.org/ethercat!10
2021-04-21 09:26:02 +00:00
Sebastien BLANCHET 6350d7b5eb documentation: add French translation 2021-04-20 19:18:30 +02:00
Florian Pose 0ece56739b Merge branch 'fix-typo' into 'stable-1.5'
fix typo

See merge request etherlab.org/ethercat!9
2021-04-09 17:29:56 +00:00
Sebastien BLANCHET 224b7f238b fix typo 2021-04-09 19:07:29 +02:00
Florian Pose 708adaad0d Update .gitlab-ci.yml 2021-04-09 16:11:19 +00:00
Florian Pose 845437f982 Update .gitlab-ci.yml 2021-04-09 15:38:21 +00:00
Florian Pose a040c9c16c Update .gitlab-ci.yml 2021-04-09 14:39:27 +00:00
Florian Pose 537fe56414 Update .gitlab-ci.yml 2021-04-09 14:02:33 +00:00
Florian Pose 14ed629e3c Update .gitlab-ci.yml file 2021-04-09 13:58:52 +00:00
Florian Pose da6f728ef9 Merge branch 'fix-doc' into 'stable-1.5'
doc: misc improvements

See merge request etherlab.org/ethercat!8
2021-04-09 10:32:20 +00:00
Florian Pose ddf59092a9 Merge branch 'add_pkg_config' into 'stable-1.5'
Add .pc file for ethercat lib

See merge request etherlab.org/ethercat!7
2021-04-09 10:30:53 +00:00