From c0000aa304b99a90ba93cc61a1e2c03bcfdb009b Mon Sep 17 00:00:00 2001 From: Jeong Han Lee <jeonghan.lee@gmail.com> Date: Thu, 7 Mar 2019 22:42:08 +0100 Subject: [PATCH] add EPICS_BASE CONFIG_BASE_VERSION in global conf --- configure/CONFIG | 11 +++++++++++ configure/modules/CONFIG | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/configure/CONFIG b/configure/CONFIG index d6928694..3e4fbd0d 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -19,6 +19,7 @@ endif +include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION include $(TOP)/configure/E3/CONFIG_REQUIRE include $(TOP)/configure/E3/CONFIG_E3_PATH include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE @@ -26,3 +27,13 @@ include $(TOP)/configure/E3/CONFIG_EPICS include $(TOP)/configure/E3/CONFIG_SUDO include $(TOP)/configure/E3/CONFIG_EXPORT + +VARS_EXCLUDES+=EPICS_VERSION +VARS_EXCLUDES+=EPICS_REVISION +VARS_EXCLUDES+=EPICS_MODIFICATION +VARS_EXCLUDES+=EPICS_PATCH_LEVEL +VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT +VARS_EXCLUDES+=EPICS_PATCH_VSTRING +VARS_EXCLUDES+=EPICS_SITE_VSTRING +VARS_EXCLUDES+=COMMIT_DATE + diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG index 2e4bf28a..9c74c6c4 100644 --- a/configure/modules/CONFIG +++ b/configure/modules/CONFIG @@ -1,5 +1,6 @@ # -*- mode: Makefile;-*- +include $(EPICS_BASE)/configure/CONFIG_BASE_VERSION include $(REQUIRE_CONFIG)/CONFIG_REQUIRE include $(REQUIRE_CONFIG)/CONFIG_E3_PATH include $(REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE @@ -8,3 +9,12 @@ include $(REQUIRE_CONFIG)/CONFIG_SUDO include $(REQUIRE_CONFIG)/CONFIG_DKMS include $(REQUIRE_CONFIG)/CONFIG_EXPORT +VARS_EXCLUDES+=EPICS_VERSION +VARS_EXCLUDES+=EPICS_REVISION +VARS_EXCLUDES+=EPICS_MODIFICATION +VARS_EXCLUDES+=EPICS_PATCH_LEVEL +VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT +VARS_EXCLUDES+=EPICS_PATCH_VSTRING +VARS_EXCLUDES+=EPICS_SITE_VSTRING +VARS_EXCLUDES+=COMMIT_DATE + -- GitLab