diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:34:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:04:52 +0000 |
| commit | e7e2d84bec0d404057bce203f9c90231360e88ee (patch) | |
| tree | 43e54e897217da67906580991c3c7f0a110250e8 /patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch | |
| parent | 70f2caa773fc5f0e2b1154a5c095665375f02666 (diff) | |
Rebase: deploy related patch series.
After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.
While we're at it, re-export Fuel@OPNFV patches in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
Diffstat (limited to 'patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch deleted file mode 100644 index 454cef68..00000000 --- a/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Thu, 3 Mar 2016 19:04:07 +0100 -Subject: [PATCH] Build bootstrap image for arm64 - -For now the arch is hardcoded for simplicity. We should detect this -but how? If we're multi-arch then one bootstrap image should be built -per supported arch. This requires Fuel refactoring. ---- - build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/build/bootstrap_admin_node.sh.patch -+++ b/build/bootstrap_admin_node.sh.patch -@@ -53,6 +53,23 @@ - # Enable iptables - systemctl enable iptables.service - *************** -+*** 484,490 **** -+ local ret=1 -+ echo ${bs_progress_message} >&2 -+ set_ui_bootstrap_error "${bs_progress_message}" >&2 -+! if fuel-bootstrap -v --debug build --activate >>"$bs_build_log" 2>&1; then -+ ret=0 -+ fuel notify --topic "done" --send "${bs_done_message}" -+ else -+--- 484,490 ---- -+ local ret=1 -+ echo ${bs_progress_message} >&2 -+ set_ui_bootstrap_error "${bs_progress_message}" >&2 -+! if fuel-bootstrap -v --debug build --target_arch arm64 --activate >>"$bs_build_log" 2>&1; then -+ ret=0 -+ fuel notify --topic "done" --send "${bs_done_message}" -+ else -+*************** - *** 529,534 **** - --- 541,556 ---- - |