From ccf57699bbff183ef45fd4a4e94df094ca69ee87 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Tue, 29 Mar 2016 14:42:46 +0200 Subject: Rebase patches and fix importing * We were missing the patch rebase changes that were introduced by gerrit automatic upstream project update for submodules. This patch introduces them. * Apply all submodule patches a single `git am` call to help with rebasing patches. * Correct Opendaylight plugin initialization in repo config. Signed-off-by: Stanislaw Kardach --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 294a8861..d5303465 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ patches-import: @git submodule -q foreach 'git tag armband-workbench-root' @git submodule -q foreach 'git checkout -q -b armband-workbench' @git submodule -q foreach \ - 'for p in $$(ls ${root}/patches/$$name/); do \ - git am ${root}/patches/$$name/$$p; \ - done' + 'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \ + git am ${root}/patches/$$name/*.patch; \ + fi' clean-docker: docker stop FUEL_CENTOS_8.0 || true docker rm $(docker ps -a -q) || true -- cgit 1.2.3-korg