Rebase: Sync after Build system uplift to Fuel 9.0

[armband.git] / patches / opnfv-fuel / 0004-Build-bootstrap-image-for-arm64.patch

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 1ec568b..454cef6 100644 (file)
--- 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 ----
+