diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:18:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:59:53 +0200 |
| commit | 48bc9269c4f452ae184238e0aae37c319e6f7040 (patch) | |
| tree | 75f5b3c99916694bc6f15c08c8dc7e24226c343b /patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch | |
| parent | 4ab28df9437c18a5a08fd774322df34a68a409d0 (diff) | |
Rebase: Sync after Build system uplift to Fuel 9.0
Refresh patches after Fuel@OPNFV migrated to Mitaka in [1],
"Build system uplift to Fuel 9.0/Mitaka".
>As bootstrap_admin_node.sh has
>been transitioned into an RPM (fuel-support), the lazy designer found
>it more simple to patch that script during the Fuel build phase than
>at the OPNFV ISO generation. The patch mechanism has been changed to
>a normal context diff instead of the orig/modified file tuples
>previously used. Hopefully this will require fewer manual rebases
>(may the fuzz be with us!).
>Also the ks.cfg patching has transitioned to a context based ordinary
>patch for the same reasons, but this is as before taking place during
>OPNFV ISO generation.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
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 ---- + |