X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=patches%2Fopnfv-fuel%2F0021-Build-bootstrap-image-for-arm64.patch;h=4daf733ecb122cf09d8a4f1671976a02395f80d2;hb=7561f5f237a6abf84f7fd8adff94069906aded95;hp=42218ad1ed791ca0d2111a8575ff4852b0c23ff5;hpb=e7e2d84bec0d404057bce203f9c90231360e88ee;p=armband.git

diff --git a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
index 42218ad1..4daf733e 100644
--- a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch
@@ -9,31 +9,19 @@ per supported arch. This requires Fuel refactoring.
  build/bootstrap_admin_node.sh.patch | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
-diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
-index aeef3f7..c66b497 100644
---- 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 ----
-   
+diff --git a/build/patch-repos/0010-bootstrap_admin_node.sh.patch b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
+--- a/build/patch-repos/0010-bootstrap_admin_node.sh.patch
++++ b/build/patch-repos/0010-bootstrap_admin_node.sh.patch
+@@ -53,3 +53,12 @@
+  # Enable iptables
+  systemctl enable iptables.service
++@@ -484,7 +490,7 @@
++         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
+ @@ -532,6 +545,16 @@ systemctl start ntpd