diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer | Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 15:07:29 +0200 |
| commit | ccf57699bbff183ef45fd4a4e94df094ca69ee87 (patch) | |
| tree | d9944c56ff1126f3bdbb6afaaba8f862c6b5352b /Makefile | |
| parent | f101dd4429858b1b313eec81959576d974b34f23 (diff) | |
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 <stanislaw.kardach@caviumnetworks.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |