summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-25 16:14:29 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-25 16:14:29 +0000
commit05855cfbfa817822a6513176865580081b35df30 (patch)
treeab74d05632e386a81add90cf52054d4ad29bf845
parentbe929d5e65b7b2362f92c935c199fe901b7f32d1 (diff)
parent6ec779bb1196892bd8bffbb98354cc07c60da5a8 (diff)
Merge "Fix indentation and add patch-import output"
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 619d0b7a..333bf5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ submodules-init:
submodules-clean:
@git submodule -q foreach \
'git am --abort; \
- git checkout -q armband-workbench-root; \
+ git checkout -q armband-workbench-root; \
git branch -q -D armband-workbench; \
git tag -d armband-workbench-root; \
git reset -q --hard HEAD; git clean -xdff'
@@ -33,6 +33,7 @@ patches-import:
@git submodule -q foreach 'git checkout -q -b armband-workbench'
@git submodule -q foreach \
'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \
+ echo "-- patching $$name"; \
git am ${root}/patches/$$name/*.patch; \
fi'
clean-docker: