Upstream: p/common.py: catch stderr in exec_cmd.

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index 1e123a8..333bf5a 100644 (file)
--- 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:
@@ -61,6 +62,7 @@ build:
                        UBUNTU_ARCH="amd64 arm64" \
                        FUELLIB_REPO=${root}/upstream/fuel-library \
                        NAILGUN_REPO=${root}/upstream/fuel-web \
+                       ASTUTE_REPO=${root}/upstream/fuel-astute \
                        FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
                        FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
                        FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
@@ -68,6 +70,7 @@ build:
                        ODL_CHANGE= \
                        FUELLIB_COMMIT=HEAD \
                        NAILGUN_COMMIT=HEAD \
+                       ASTUTE_COMMIT=HEAD \
                        FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \