From a38deb88ed5fc0dc7e94404ef522898cb5741fb6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 13 Jul 2017 00:21:03 +0200 Subject: 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 --- .../0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch') 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 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 -- cgit 1.2.3-korg