From 48ac3d6527bfb8ea0c7a34d09b3b1bf53b40ce47 Mon Sep 17 00:00:00 2001 From: Jeong Han Lee <jeonghan.lee@gmail.com> Date: Sat, 10 Nov 2018 20:07:50 +0100 Subject: [PATCH] fixed dkms support --- configure/modules/CONFIG | 1 + configure/modules/CONFIG_DKMS | 2 ++ configure/modules/CONFIG_SUDO | 1 + configure/modules/RULES_DKMS | 4 ---- configure/modules/RULES_SITEMODS | 1 + require-ess | 2 +- tools/ess-env.conf | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 configure/modules/CONFIG_DKMS diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index e2bc2912..d4c2f700 100644 --- a/configure/modules/CONFIG +++ b/configure/modules/CONFIG @@ -6,4 +6,5 @@ include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE include $(REQUIRE_CONFIG)/CONFIG_EPICS include $(REQUIRE_CONFIG)/CONFIG_SUDO include $(REQUIRE_CONFIG)/CONFIG_EXPORT +include $(REQUIRE_CONFIG)/CONFIG_DKMS diff --git a/configure/modules/CONFIG_DKMS b/configure/modules/CONFIG_DKMS new file mode 100644 index 00000000..0eb5a6ab --- /dev/null +++ b/configure/modules/CONFIG_DKMS @@ -0,0 +1,2 @@ +DKMS:=/usr/sbin/dkms +DKMS_ARGS:=-m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION) diff --git a/configure/modules/CONFIG_SUDO b/configure/modules/CONFIG_SUDO index e72dc9dc..10840800 100644 --- a/configure/modules/CONFIG_SUDO +++ b/configure/modules/CONFIG_SUDO @@ -12,6 +12,7 @@ SUDO := SUDOBASH = bash -c endif +SUDO2 := $(SUDO) -E bash -c # Valid for only Development Mode, because we clone/remove them # See RULES_DEV diff --git a/configure/modules/RULES_DKMS b/configure/modules/RULES_DKMS index 9e667959..020e659c 100644 --- a/configure/modules/RULES_DKMS +++ b/configure/modules/RULES_DKMS @@ -1,8 +1,4 @@ -SUDO2:=sudo -E bash -c -DKMS:=/usr/sbin/dkms -DKMS_ARGS:=-m $(E3_MODULE_NAME) -v $(E3_MODULE_VERSION) - .PHONY: dkms_build dkms_remove dkms_install dkms_uninstall diff --git a/configure/modules/RULES_SITEMODS b/configure/modules/RULES_SITEMODS index e5e0f630..0ada2ab3 100644 --- a/configure/modules/RULES_SITEMODS +++ b/configure/modules/RULES_SITEMODS @@ -7,6 +7,7 @@ include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS include $(REQUIRE_CONFIG)/RULES_VARS include $(REQUIRE_CONFIG)/RULES_VLIBS +include $(REQUIRE_CONFIG)/RULES_DKMS include $(REQUIRE_CONFIG)/RULES_PROD ifneq (,$(findstring dev,$(MAKECMDGOALS))) diff --git a/require-ess b/require-ess index 068ec9ee..de6c4cff 160000 --- a/require-ess +++ b/require-ess @@ -1 +1 @@ -Subproject commit 068ec9eed726f5f2e0938a3948b64f982b6ad91b +Subproject commit de6c4cff2a43c5a5e198248281c480c005adc7bc diff --git a/tools/ess-env.conf b/tools/ess-env.conf index ba62801b..93f087c5 100644 --- a/tools/ess-env.conf +++ b/tools/ess-env.conf @@ -1 +1 @@ -IOCSH_HASH_VERSION=230ab74 +IOCSH_HASH_VERSION=256962d -- GitLab