From 38cb68dd09af879ea515a6f8de010111bf195899 Mon Sep 17 00:00:00 2001 From: Jeong Han Lee Date: Mon, 23 Dec 2019 23:13:53 +0100 Subject: [PATCH] remove the removal of ccat_net.conf in order to use this with generic and native ccat configuration --- configure/E3/RULES_ETHERLAB | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configure/E3/RULES_ETHERLAB b/configure/E3/RULES_ETHERLAB index 8f711dd..f492db7 100644 --- a/configure/E3/RULES_ETHERLAB +++ b/configure/E3/RULES_ETHERLAB @@ -111,11 +111,6 @@ dkms_uninstall: ## Configuration for EtherCAT Master (systemd, ethercat.conf, and others) setup: -ifeq ($(WITH_DEV_CCAT),YES) - $(QUIET) echo ">>> If /etc/module-load.d/ccat_netdev.conf exists," - $(QUIET) echo " we are removing it, because it cannot be coexist with ec_ccat_netdev.\n" - $(QUIET) $(SUDO_CMD) find /etc/modules-load.d/ -maxdepth 1 -name "ccat_netdev*" -exec rm {} + -endif $(QUIET) bash $(TOP)/scripts/etherlab_setup.bash -t $(E3_ETHERLAB_INSTALL_LOCATION) ## Clean up the configuration for EtherCAT Master (systemd, ethercat.conf, and others)