patches/opnfv-fuel/0010-curtin-arm64-Fix-missing-newline.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Wed, 23 May 2018 18:53:04 +0200
   3 Subject: [PATCH] curtin: arm64: Fix missing newline
   4
   5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   6 ---
   7  ...4-Fix-missing-newline-after-j2-parse.patch | 30 +++++++++++++++++++
   8  mcp/patches/patches.list                      |  1 +
   9  2 files changed, 31 insertions(+)
  10  create mode 100644 mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch
  11
  12 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
  13 new file mode 100644
  14 index 00000000..f16ed9e7
  15 --- /dev/null
  16 +++ b/mcp/patches/0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch
  17 @@ -0,0 +1,30 @@
  18 +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  19 +: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
  20 +:
  21 +: All rights reserved. This program and the accompanying materials
  22 +: are made available under the terms of the Apache License, Version 2.0
  23 +: which accompanies this distribution, and is available at
  24 +: http://www.apache.org/licenses/LICENSE-2.0
  25 +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  26 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  27 +Date: Wed, 23 May 2018 05:28:00 +0200
  28 +Subject: [PATCH] curtin: arm64: Fix missing newline after j2 parse
  29 +
  30 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  31 +---
  32 + maas/files/curtin_userdata_arm64_generic_xenial | 2 +-
  33 + 1 file changed, 1 insertion(+), 1 deletion(-)
  34 +
  35 +diff --git a/maas/files/curtin_userdata_arm64_generic_xenial b/maas/files/curtin_userdata_arm64_generic_xenial
  36 +index b070aaa..21877b2 100644
  37 +--- a/maas/files/curtin_userdata_arm64_generic_xenial
  38 ++++ b/maas/files/curtin_userdata_arm64_generic_xenial
  39 +@@ -22,7 +22,7 @@ late_commands:
  40 + {% set salt_repo_key = salt['hashutil.base64_b64encode'](cluster.saltstack_repo_key) %}
  41 +   apt_00_set_gpg: ["curtin", "in-target", "--", "sh", "-c", "echo '{{salt_repo_key}}' | base64 -d | apt-key add -"]
  42 + {%- endif %}
  43 +-{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent -#}
  44 ++{#- NOTE: Re-use amd64 repos on arm64 since most packages are arch independent #}
  45 +   apt_01_set_repo: ["curtin", "in-target", "--", "sh", "-c", "echo 'deb [arch=amd64] {{ cluster.saltstack_repo_xenial }}' >> /etc/apt/sources.list"]
  46 + {% raw %}
  47 +   apt_03_update: ["curtin", "in-target", "--", "apt-get", "update"]
  48 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
  49 index 39e737d6..b3aa013e 100644
  50 --- a/mcp/patches/patches.list
  51 +++ b/mcp/patches/patches.list
  52 @@ -18,3 +18,4 @@
  53  /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
  54  /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
  55  /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
  56 +/usr/share/salt-formulas/env: 0105-curtin-arm64-Fix-missing-newline-after-j2-parse.patch