Merge branch 'disable-8139too' into 'master'

Disable 8139too driver by default

Closes #90

See merge request etherlab.org/ethercat!106
This commit is contained in:
Florian Pose 2024-01-31 14:19:47 +00:00
commit 4f529ade67
3 changed files with 3 additions and 4 deletions

View File

@ -6,7 +6,7 @@ build:
script: script:
- ./bootstrap - ./bootstrap
- ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --disable-8139too --enable-tty --with-devices=2 --enable-ccat - ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --enable-tty --with-devices=2 --enable-ccat
- make -j8 all modules - make -j8 all modules
- make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck - make DISTCHECK_CONFIGURE_FLAGS="--with-linux-dir=/usr/src/linux-obj/$(uname -i)/default" distcheck
@ -48,7 +48,7 @@ doxygen:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
script: script:
- ./bootstrap - ./bootstrap
- ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --disable-8139too --enable-tty --with-devices=2 --enable-ccat - ./configure --with-linux-dir=/usr/src/linux-obj/$(uname -i)/default --enable-tty --with-devices=2 --enable-ccat
- doxygen - doxygen
- mv doxygen-output/html/ html/ - mv doxygen-output/html/ html/
artifacts: artifacts:

View File

@ -30,7 +30,6 @@ include $(top_srcdir)/Makefile.kbuild
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = \ AM_DISTCHECK_CONFIGURE_FLAGS = \
--disable-8139too \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
SUBDIRS = \ SUBDIRS = \

View File

@ -208,7 +208,7 @@ AC_ARG_ENABLE([8139too],
;; ;;
esac esac
], ],
[enable8139too=$enablekernel] [enable8139too=0] # disabled by default
) )
AM_CONDITIONAL(ENABLE_8139TOO, test "x$enable8139too" = "x1") AM_CONDITIONAL(ENABLE_8139TOO, test "x$enable8139too" = "x1")