summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Kardach <stanislaw.kardach@cavium.com>2016-05-24 16:25:13 +0200
committerStanislaw Kardach <stanislaw.kardach@cavium.com>2016-05-24 16:25:13 +0200
commit6ec779bb1196892bd8bffbb98354cc07c60da5a8 (patch)
treec35ff90acc9c5dcb939185062fa7c14aa5d67bd9
parent5dc680ca9524d8f2bd4ef1e2c198203a4c68480d (diff)
Fix indentation and add patch-import output
I've added submodule name to `patch-import` target to make it easier to spot in which submodule does patch import fail. Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
-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: