meta-patches-arm: update stx-puppet patches for stx10.0

Issue-ID: INF-495

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I2855b7c920fbca9d8b83254e46a252def1a1df90

diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0002-puppet-manifests-add-arm64-support-for-etcd.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-add-arm64-support-for-etcd.patch
similarity index 90%
rename from scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0002-puppet-manifests-add-arm64-support-for-etcd.patch
rename to scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-add-arm64-support-for-etcd.patch
index 2366891..96b7f2e 100644 (file)
--- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0002-puppet-manifests-add-arm64-support-for-etcd.patch
+++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-add-arm64-support-for-etcd.patch
@@ -1,7 +1,7 @@
-From 1b3c2bf1aa20eb17cbafd54e85e7afe806a91aaf Mon Sep 17 00:00:00 2001
+From a1d6dd94f0f942272b9728f4a3b157eff9795fc7 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Wed, 12 Jul 2023 10:32:54 +0800
-Subject: [PATCH 2/2] puppet-manifests: add arm64 support for etcd
+Subject: [PATCH] puppet-manifests: add arm64 support for etcd
 
 Add environmnet ETCD_UNSUPPORTED_ARCH=arm64 for etcd
 so it will workaround the unsupported warning.

diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-fix-the-hardcoded-kernel-name.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-fix-the-hardcoded-kernel-name.patch
deleted file mode 100644 (file)
index 4c5a721..0000000
--- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/stx-puppet/0001-puppet-manifests-fix-the-hardcoded-kernel-name.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1671972d0f1bfeed4ac2243cefd90ca169f334a9 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Wed, 12 Jul 2023 10:32:54 +0800
-Subject: [PATCH 1/2] puppet-manifests: fix the hardcoded kernel name
-
-The kernel names in puppet-update-grub-env.py is hardcoded
-as amd64, use dpkg-architecture to check host arch and
-replace the hardcoded names.
-
-Test Plan:
-PASS: build-pkgs on x86-64 host
-PASS: build-image on x86-64 host
-PASS: build-pkgs on arm64 host
-PASS: build-image on arm64 host
-PASS: install AIO-SX on x86-64 targets
-PASS: install AIO-SX on arm64 targets
-
-Story: 2010739
-Task: 48284
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-Change-Id: I1df220f585f53e58f2fcd8f6918273f8ea45fb90
----
- puppet-manifests/debian/deb_folder/rules | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/puppet-manifests/debian/deb_folder/rules b/puppet-manifests/debian/deb_folder/rules
-index ec2bca6c..f5ba9a01 100755
---- a/puppet-manifests/debian/deb_folder/rules
-+++ b/puppet-manifests/debian/deb_folder/rules
-@@ -1,6 +1,8 @@
- #!/usr/bin/make -f
- #export DH_VERBOSE = 1
- 
-+export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-+
- %:
-       dh $@
- 
-@@ -10,6 +12,9 @@ override_dh_usrlocal:
-       echo "Do Nothing"
- 
- override_dh_install:
-+ifeq ($(DEB_HOST_ARCH),arm64)
-+      sed -i "s/amd64/arm64/" $(CURDIR)/bin/puppet-update-grub-env.py
-+endif
-       $(MAKE) install hiera_v5=true ignore_puppet_warnings=true \
-               BINDIR=$(CURDIR)/debian/tmp/usr/local/bin \
-               CONFIGDIR=$(CURDIR)/debian/tmp/etc/puppet \
--- 
-2.30.2
-