summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-13 00:21:03 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-13 00:29:08 +0200
commita38deb88ed5fc0dc7e94404ef522898cb5741fb6 (patch)
tree27633d3de8d95c35da6961680ba9dc277de3b9a3 /patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
parentde0b0f160f6ac408c2ba302507ede4d0a537b73f (diff)
p/fuel: Rebase, drop --depth=1 when cloning Fuel
`git clone --depth=1` does not preserve git history, so 3-way merge is not possible. There are 2 ways to fix this: - (recurrent) rebase patches by adjusting patch context; - (one-time, with a recurrent very small performance hit) preserve git history when cloning Fuel@OPNFV in salt.sh; So, let's drop "--depth=1" and ensure `git am -3` will continue to work on future patch context changes (where possbile). While we're at it, also rebase our current patches. Change-Id: Iacfb4daf90a170174405410ff9c988c4fcac79ca Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch')
-rw-r--r--patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
index 909b1705..1b51d9df 100644
--- a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
+++ b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch
@@ -11,11 +11,11 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
-index c876450..bb4f6cc 100755
+index 605da89..c44168e 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
-@@ -18,6 +18,10 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
- ln -s /root/fuel/mcp/reclass /srv/salt/reclass
+@@ -23,6 +23,10 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
+ cd /root/fuel/mcp/patches && ./patch.sh patches.list reclass
cd /srv/salt/scripts
+ if [ "\$(uname -i)" = "aarch64" ]; then