diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index e2bc29122cc25c2a9faf7995282b90ef468c935f..d4c2f7004483de5fd680734d2923f761c6b0a64c 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 0000000000000000000000000000000000000000..0eb5a6aba83f8e079d68c3c9683770dc676c82ae --- /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 e72dc9dc8c7c9c4a23495f9bf7e118fceb74ea60..10840800849af4acddd9585fabe33689a03ac616 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 9e6679594acda74b3cf2f37c4bd934f338ae3c76..020e659c459ada1e4bdbc7a8ad7644aa7be5fca2 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 e5e0f6301319db6bbcb23131fa15f495e3c2ecab..0ada2ab357d3d43eae3534f96cb5f4ac03230c16 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 068ec9eed726f5f2e0938a3948b64f982b6ad91b..de6c4cff2a43c5a5e198248281c480c005adc7bc 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 ba62801ba1f18377953e09fbfd759f92e2349219..93f087c561df4f9ede172260345201e9363857ff 100644 --- a/tools/ess-env.conf +++ b/tools/ess-env.conf @@ -1 +1 @@ -IOCSH_HASH_VERSION=230ab74 +IOCSH_HASH_VERSION=256962d