Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Lindh Olsson
e3-require
Commits
604d3cfb
Commit
604d3cfb
authored
4 years ago
by
Anders Lindh Olsson
Browse files
Options
Downloads
Patches
Plain Diff
move DEBUG_SHELL shell definition to CONFIG_SHELL
parent
9e9e95fd
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure/E3/CONFIG_SHELL
+5
-1
5 additions, 1 deletion
configure/E3/CONFIG_SHELL
configure/E3/DEFINES_FT
+0
-8
0 additions, 8 deletions
configure/E3/DEFINES_FT
configure/modules/DEFINES_FT
+0
-7
0 additions, 7 deletions
configure/modules/DEFINES_FT
with
5 additions
and
16 deletions
configure/E3/CONFIG_SHELL
+
5
−
1
View file @
604d3cfb
SHELL = /usr/bin/bash
ifdef DEBUG_SHELL
SHELL = /bin/sh -x
else
SHELL = /usr/bin/bash
endif
This diff is collapsed.
Click to expand it.
configure/E3/DEFINES_FT
+
0
−
8
View file @
604d3cfb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
configure/modules/DEFINES_FT
+
0
−
7
View file @
604d3cfb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment