diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-11 18:57:57 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-01 01:03:48 +0200 |
| commit | bb2dc1e4d661b51c561a60530639ba439d824870 (patch) | |
| tree | 0ca1799044839244ac898ab5b8f9630d63027e97 /mcp/patches/Makefile | |
| parent | 81c74a3da29cabc3fe76d3b5467378d84fd2767e (diff) | |
salt.sh, user-data: Add Saltstack arm64 repo
These changes will only be applied on AArch64, based on `uname -m`.
While at it, add arm64 suppport to salt-master-setup.sh.
Upstream commit [1] broke Salt bootstrap on AArch64, by
introducing an architecture condition that is too strict to allow
Debian package installation (even if we provide our own repo).
Add "arm64" to the list of supported architectures. This needs
to be done on the fly, as the bootstrap script is fetched using
`curl` from <salt-master-setup.sh>.
[1] https://github.com/saltstack/salt-bootstrap/commit/caa6d7d
Change-Id: Id706a74a52ffe2f8b8c9dd3b9f70c78f35b2f745
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/Makefile')
| -rw-r--r-- | mcp/patches/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile index fafa83f86..7468d01e0 100644 --- a/mcp/patches/Makefile +++ b/mcp/patches/Makefile @@ -87,7 +87,7 @@ patches-import: sub .cachepatched SUB_TAG=${F_OPNFV_TAG}-fuel$$SUB_FEATURE/patch; \ echo "`tput setaf 2`-- patching $$name ($$SUB_TAG)`tput sgr0`";\ git tag $$SUB_TAG-root && \ - git am -3 --whitespace=nowarn --patch-format=mbox \ + git am -3 --ignore-whitespace --patch-format=mbox \ --committer-date-is-author-date $$SUB_PATCHES && \ git tag $$SUB_TAG || exit 1; \ fi \ |