From b3fd1f3d28f8a67c558531f48fae4a0243974cd6 Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Fri, 15 Oct 2021 16:13:44 +0200 Subject: [PATCH] Removed some extra vars from configure/E3 --- configure/CONFIG | 4 ++++ configure/E3/CONFIG_E3_MAKEFILE | 1 + configure/E3/CONFIG_SHELL | 2 ++ configure/E3/CONFIG_TEST | 2 ++ 4 files changed, 9 insertions(+) diff --git a/configure/CONFIG b/configure/CONFIG index 84aeef59..a6f25bee 100644 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -29,6 +29,10 @@ include $(TOP)/configure/E3/CONFIG_EXPORT include $(TOP)/configure/E3/CONFIG_TEST +VARS_EXCLUDES+=BASE_3_14 +VARS_EXCLUDES+=BASE_3_15 +VARS_EXCLUDES+=BASE_3_16 +VARS_EXCLUDES+=BASE_7_0 VARS_EXCLUDES+=EPICS_VERSION VARS_EXCLUDES+=EPICS_REVISION VARS_EXCLUDES+=EPICS_MODIFICATION diff --git a/configure/E3/CONFIG_E3_MAKEFILE b/configure/E3/CONFIG_E3_MAKEFILE index 090cdb47..1e8aad83 100644 --- a/configure/E3/CONFIG_E3_MAKEFILE +++ b/configure/E3/CONFIG_E3_MAKEFILE @@ -34,3 +34,4 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS) ## the following variables to display VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS +VARS_EXCLUDES+=GIT_REMOTE_NAME diff --git a/configure/E3/CONFIG_SHELL b/configure/E3/CONFIG_SHELL index 22770a9b..931904ed 100644 --- a/configure/E3/CONFIG_SHELL +++ b/configure/E3/CONFIG_SHELL @@ -4,3 +4,5 @@ ifdef DEBUG_SHELL else SHELL = /usr/bin/bash endif + +VARS_EXCLUDES += SHELL diff --git a/configure/E3/CONFIG_TEST b/configure/E3/CONFIG_TEST index 4b27c89c..90d16727 100644 --- a/configure/E3/CONFIG_TEST +++ b/configure/E3/CONFIG_TEST @@ -1 +1,3 @@ TEST_DIR:=$(TOP)/tests + +VARS_EXCLUDES+=TEST_DIR -- GitLab