diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:15:59 +0000 |
| commit | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (patch) | |
| tree | e72adfd031bb09477d36723cd77609536a9f5fa3 /Makefile | |
| parent | 24428f3c202e3b889114915d06ddb1178369c117 (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>
(cherry picked from commit ccf57699bbff183ef45fd4a4e94df094ca69ee87)
Change-Id: I88be0617196bc77cf237a9818f7368f6eb78f6b3
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 |