From 4270458ba464057578f2bbc7360fb8d0f8fa89cc Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 May 2018 17:32:56 +0200 Subject: u/fuel: Bump & rebase for upstream ODL leveldbjni JIRA: ARMBAND-387 Change-Id: Id24c15f7390bb63b6c422f1da8548effd5aa885a Signed-off-by: Alexandru Avadanii --- .../0008-curtin-arm64-Fix-missing-newline.patch | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100644 patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch (limited to 'patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch') diff --git a/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch b/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch deleted file mode 100644 index 7d830cc3..00000000 --- a/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Alexandru Avadanii -Date: Wed, 23 May 2018 18:53:04 +0200 -Subject: [PATCH] curtin: arm64: Fix missing newline - -Signed-off-by: Alexandru Avadanii ---- - ...4-Fix-missing-newline-after-j2-parse.patch | 30 +++++++++++++++++++ - mcp/patches/patches.list | 1 + - 2 files changed, 31 insertions(+) - create mode 100644 mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch - -diff --git a/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch b/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch -new file mode 100644 -index 00000000..f16ed9e7 ---- /dev/null -+++ b/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch -@@ -0,0 +1,30 @@ -+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -+: Copyright (c) 2018 Mirantis Inc., Enea AB and others. -+: -+: All rights reserved. This program and the accompanying materials -+: are made available under the terms of the Apache License, Version 2.0 -+: which accompanies this distribution, and is available at -+: http://www.apache.org/licenses/LICENSE-2.0 -+:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -+From: Alexandru Avadanii -+Date: Wed, 23 May 2018 05:28:00 +0200 -+Subject: [PATCH] curtin: arm64: Fix missing newline after j2 parse -+ -+Signed-off-by: Alexandru Avadanii -+--- -+ maas/files/curtin_userdata_arm64_generic_xenial | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/maas/files/curtin_userdata_arm64_generic_xenial b/maas/files/curtin_userdata_arm64_generic_xenial -+index b070aaa..21877b2 100644 -+--- a/maas/files/curtin_userdata_arm64_generic_xenial -++++ b/maas/files/curtin_userdata_arm64_generic_xenial -+@@ -22,7 +22,7 @@ late_commands: -+ {% set salt_repo_key = salt['hashutil.base64_b64encode'](cluster.saltstack_repo_key) %} -+ apt_00_set_gpg: ["curtin", "in-target", "--", "sh", "-c", "echo '{{salt_repo_key}}' | base64 -d | apt-key add -"] -+ {%- endif %} -+-{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent -#} -++{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent #} -+ apt_01_set_repo: ["curtin", "in-target", "--", "sh", "-c", "echo 'deb [arch=amd64] {{ cluster.saltstack_repo_xenial }}' >> /etc/apt/sources.list"] -+ {% raw %} -+ apt_03_update: ["curtin", "in-target", "--", "apt-get", "update"] -diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 39e737d6..b3aa013e 100644 ---- a/mcp/patches/patches.list -+++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ - /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch - /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch - /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch -+/usr/share/salt-formulas/env: 0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch -- cgit 1.2.3-korg