Skip to content
Snippets Groups Projects
Commit 604d3cfb authored by Anders Lindh Olsson's avatar Anders Lindh Olsson :8ball:
Browse files

move DEBUG_SHELL shell definition to CONFIG_SHELL

parent 9e9e95fd
No related branches found
No related tags found
No related merge requests found
SHELL = /usr/bin/bash
ifdef DEBUG_SHELL
SHELL = /bin/sh -x
else
SHELL = /usr/bin/bash
endif
......@@ -20,25 +20,17 @@ for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\
done
endef
define patch_revert_site
for i in $(wildcard $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch); do\
printf "\nReverting applied patch %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \
git apply -R --directory=$(E3_MODULE_SRC_PATH) --ignore-whitespace -p0 $$i;\
done
endef
ifndef VERBOSE
QUIET := @
endif
ifdef DEBUG_SHELL
SHELL = /bin/sh -x
endif
### Exclude the following variables to display
VARS_EXCLUDES+=git_update
VARS_EXCLUDES+=git_module_init_update
......
......@@ -27,7 +27,6 @@ else \
fi
endef
define patch_revert_site
patches=$$(ls $(TOP)/patch/Site/$(E3_MODULE_VERSION)-*.p0.patch 2> /dev/null); \
if [ -n "$$patches" ]; then \
......@@ -40,16 +39,10 @@ else \
fi
endef
ifndef VERBOSE
QUIET := @
endif
ifdef DEBUG_SHELL
SHELL = /bin/sh -x
endif
### Exclude the following variables to display
VARS_EXCLUDES+=git_update
VARS_EXCLUDES+=git_module_init_update
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment