diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-02 18:21:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-02 18:21:32 +0000 |
| commit | 32300322d76d4dcb0603c8f22379617124b95a58 (patch) | |
| tree | 956e4f67f06fa1291239b76ee3f1d025c16ced59 /patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch | |
| parent | d27aebafcdc8b86dcd2316636b4c13669e4af85f (diff) | |
| parent | 48bc9269c4f452ae184238e0aae37c319e6f7040 (diff) | |
Merge "Rebase: Sync after Build system uplift to Fuel 9.0"
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 | 39 |
1 files changed, 26 insertions, 13 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 index 1ec568be..454cef68 100644 --- a/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch +++ b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch @@ -9,16 +9,29 @@ per supported arch. This requires Fuel refactoring. build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -index b096a78..744f352 100755 ---- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -+++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh -@@ -325,7 +325,7 @@ build_ubuntu_bootstrap () { - 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 -+ 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 +--- 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 ---- + |