From: Jackie Huang Date: Mon, 16 Jun 2025 03:10:37 +0000 (+0800) Subject: meta-patches-arm: update stx-integ patches for stx10.0 X-Git-Tag: l-release~2^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=470176e5aa4487ee42ab81c93798baaed55e4960;p=pti%2Frtp.git meta-patches-arm: update stx-integ patches for stx10.0 Issue-ID: INF-495 Signed-off-by: Jackie Huang Change-Id: I7dc558ccf510eacd99027ddfc94741759fc36e2a --- diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0001-crictl-add-dl_path_arm64-meta_data.yaml.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0001-crictl-add-dl_path_arm64-meta_data.yaml.patch index 72929ee9..466e6a10 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0001-crictl-add-dl_path_arm64-meta_data.yaml.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0001-crictl-add-dl_path_arm64-meta_data.yaml.patch @@ -1,4 +1,4 @@ -From 8d61823f6ff3444b4c5f5dc392eab9aca74484ac Mon Sep 17 00:00:00 2001 +From fafc53fcaae9ca6a257600ff679452ab613a1c4c Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 26 Jul 2023 17:38:08 +0800 Subject: [PATCH 01/12] crictl: add dl_path_arm64 meta_data.yaml diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0002-containerd-add-dl_path_arm64-in-meta_data.yaml.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0002-containerd-add-dl_path_arm64-in-meta_data.yaml.patch index 9883aa5d..d6a7719b 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0002-containerd-add-dl_path_arm64-in-meta_data.yaml.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0002-containerd-add-dl_path_arm64-in-meta_data.yaml.patch @@ -1,4 +1,4 @@ -From 48534868e120b89468d1f7805603f717e45bbb75 Mon Sep 17 00:00:00 2001 +From b2976defeacf3dc34d6ca13b0168e54bf19e6476 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 28 Jun 2023 09:51:39 +0800 Subject: [PATCH 02/12] containerd: add dl_path_arm64 in meta_data.yaml diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0003-runc-add-dl_path_arm64-in-meta_data.yaml.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0003-runc-add-dl_path_arm64-in-meta_data.yaml.patch index 3d9d3291..8a19cd60 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0003-runc-add-dl_path_arm64-in-meta_data.yaml.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0003-runc-add-dl_path_arm64-in-meta_data.yaml.patch @@ -1,4 +1,4 @@ -From bcbd1156399106a4baf156ed144759579d7176d3 Mon Sep 17 00:00:00 2001 +From 5e3015be41c6e00b9dd47bf440385614d5b044f6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 28 Jun 2023 10:23:00 +0800 Subject: [PATCH 03/12] runc: add dl_path_arm64 in meta_data.yaml @@ -32,15 +32,15 @@ Signed-off-by: Jackie Huang 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kubernetes/runc/debian/deb_folder/copyright b/kubernetes/runc/debian/deb_folder/copyright -index 737e4ed7..e33b7616 100644 +index a56ec79e..1db49c31 100644 --- a/kubernetes/runc/debian/deb_folder/copyright +++ b/kubernetes/runc/debian/deb_folder/copyright @@ -7,7 +7,7 @@ License: Apache-2 Other files are included from the upstream runc binary package at --https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64 -+https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.@BUILD_ARCH@ +-https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64 ++https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.@BUILD_ARCH@ License: Apache-2.0 @@ -53,18 +53,18 @@ index 430dc94d..1b9a3d51 100755 -runc.amd64 => usr/bin/runc +runc.@BUILD_ARCH@ => usr/bin/runc diff --git a/kubernetes/runc/debian/meta_data.yaml b/kubernetes/runc/debian/meta_data.yaml -index cc813a2f..14c6735f 100644 +index c7801a73..fc0d39e0 100644 --- a/kubernetes/runc/debian/meta_data.yaml +++ b/kubernetes/runc/debian/meta_data.yaml @@ -7,6 +7,11 @@ dl_files: topdir: null - url: https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64 - sha256sum: c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd + url: https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64 + sha256sum: aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8 +dl_files_arm64: + runc.arm64: + topdir: null -+ url: https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.arm64 -+ sha256sum: 1b309c4d5aa4cc7b888b2f79c385ecee26ca3d55dae0852e7c4a692196d5faab ++ url: https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64 ++ sha256sum: 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8 revision: dist: $STX_DIST GITREVCOUNT: diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0004-chartmuseum-add-support-for-arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0004-chartmuseum-add-support-for-arm64.patch index 68d5a5a5..00d41f10 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0004-chartmuseum-add-support-for-arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0004-chartmuseum-add-support-for-arm64.patch @@ -1,4 +1,4 @@ -From 152f4dc88e0d915cce7281c7ccced83feb581f7e Mon Sep 17 00:00:00 2001 +From 6879e30e8369ebb42e8c8ef6b23a29292236228d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 8 Feb 2023 02:09:05 -0500 Subject: [PATCH 04/12] chartmuseum: add support for arm64 diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0005-helm-add-dl_files_arm64-and-fix-the-rules.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0005-helm-add-dl_files_arm64-and-fix-the-rules.patch index dcf0a6d6..0b21678d 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0005-helm-add-dl_files_arm64-and-fix-the-rules.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0005-helm-add-dl_files_arm64-and-fix-the-rules.patch @@ -1,4 +1,4 @@ -From 5ea4c7ef61e071e82d771c8d1f457f950a736eea Mon Sep 17 00:00:00 2001 +From 240fed3bc488b5bb73466dde6e297eecb8e4b99b Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 8 Feb 2023 01:19:56 -0500 Subject: [PATCH 05/12] helm: add dl_files_arm64 and fix the rules @@ -27,48 +27,40 @@ Depends-On: https://review.opendev.org/c/starlingx/root/+/889686 Change-Id: Ie71073e590fdde8ecf8d10d08c31e07904d89964 Signed-off-by: Jackie Huang --- - kubernetes/helm/debian/deb_folder/rules | 7 ++++--- - kubernetes/helm/debian/meta_data.yaml | 9 +++++++++ - 2 files changed, 13 insertions(+), 3 deletions(-) + kubernetes/helm/debian/deb_folder/rules | 5 +++-- + kubernetes/helm/debian/meta_data.yaml | 5 +++++ + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm/debian/deb_folder/rules b/kubernetes/helm/debian/deb_folder/rules -index 6bac58e6..343a59b9 100755 +index 74e9f7e0..4344b6c9 100755 --- a/kubernetes/helm/debian/deb_folder/rules +++ b/kubernetes/helm/debian/deb_folder/rules -@@ -6,12 +6,13 @@ export ROOT = debian/tmp +@@ -6,9 +6,10 @@ export ROOT = debian/tmp export SBINDIR = $(ROOT)/usr/sbin export SUDOERDIR = $(ROOT)/etc/sudoers.d +export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null) - export HELM_VERSION = 3.12.2 + export HELM_VERSION = 3.14.4 -export HELM_EXECUTABLE = linux-amd64/helm -export HELM_PKG = helm-v$(HELM_VERSION)-linux-amd64.tar.gz +export HELM_EXECUTABLE = linux-$(DEB_HOST_ARCH)/helm +export HELM_PKG = helm-v$(HELM_VERSION)-linux-$(DEB_HOST_ARCH).tar.gz - export HELM_MAPKUBEAPIS_VERSION = 0.4.1 --export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION)_linux_amd64.tar.gz -+export HELM_MAPKUBEAPIS_PKG = helm-mapkubeapis_$(HELM_MAPKUBEAPIS_VERSION)_linux_$(DEB_HOST_ARCH).tar.gz - %: dh $@ diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml -index 915e3e4b..c210350d 100644 +index e4f7687e..25b41109 100644 --- a/kubernetes/helm/debian/meta_data.yaml +++ b/kubernetes/helm/debian/meta_data.yaml -@@ -11,6 +11,15 @@ dl_files: - topdir: mapkubeapis - url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.4.1/helm-mapkubeapis_0.4.1_linux_amd64.tar.gz - sha256sum: e90a22c4acee76774589042f6a5901e136ee33c10630790d6cff37d169905a78 +@@ -7,6 +7,11 @@ dl_files: + topdir: linux-amd64 + url: https://get.helm.sh/helm-v3.14.4-linux-amd64.tar.gz + sha256sum: a5844ef2c38ef6ddf3b5a8f7d91e7e0e8ebc39a38bb3fc8013d629c1ef29c259 +dl_files_arm64: -+ helm-v3.12.2-linux-arm64.tar.gz: ++ helm-v3.14.4-linux-arm64.tar.gz: + topdir: linux-arm64 -+ url: https://get.helm.sh/helm-v3.12.2-linux-arm64.tar.gz -+ sha256sum: cfafbae85c31afde88c69f0e5053610c8c455826081c1b2d665d9b44c31b3759 -+ helm-mapkubeapis_0.4.1_linux_arm64.tar.gz: -+ topdir: mapkubeapis -+ url: https://github.com/helm/helm-mapkubeapis/releases/download/v0.4.1/helm-mapkubeapis_0.4.1_linux_arm64.tar.gz -+ sha256sum: 893ccab831d0d868768ba1bd63c0186f83ffda89cd95c0bc86cb12add9fe0d05 ++ url: https://get.helm.sh/helm-v3.14.4-linux-arm64.tar.gz ++ sha256sum: 113ccc53b7c57c2aba0cd0aa560b5500841b18b5210d78641acfddc53dac8ab2 revision: dist: $STX_DIST diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0006-kubectl-cert-manager-add-dl_files_arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0006-kubectl-cert-manager-add-dl_files_arm64.patch index bfb137f3..caf3dfcb 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0006-kubectl-cert-manager-add-dl_files_arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0006-kubectl-cert-manager-add-dl_files_arm64.patch @@ -1,4 +1,4 @@ -From 55769435d21a5f5b50bdeb478c2f5e6a3496b94a Mon Sep 17 00:00:00 2001 +From 48a95e530982d7b7fda1c0ff4de7033fe838926b Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 8 Feb 2023 06:18:24 -0500 Subject: [PATCH 06/12] kubectl-cert-manager: add dl_files_arm64 diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0007-kubernetes-add-support-for-arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0007-kubernetes-add-support-for-arm64.patch index 1202dbed..acbcbb49 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0007-kubernetes-add-support-for-arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0007-kubernetes-add-support-for-arm64.patch @@ -1,4 +1,4 @@ -From f3f34146a74eb4e286bb3f626c2ac7d197f4b640 Mon Sep 17 00:00:00 2001 +From a5c923bf03187701ab7b8d821fd8549a83702af5 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 8 Feb 2023 03:01:19 -0500 Subject: [PATCH 07/12] kubernetes: add support for arm64 @@ -30,10 +30,10 @@ Signed-off-by: Jackie Huang 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/kubernetes/kubernetes-1.24.4/debian/deb_folder/control b/kubernetes/kubernetes-1.24.4/debian/deb_folder/control -index 4635bf47..79bd790d 100644 +index bf972671..2a234711 100644 --- a/kubernetes/kubernetes-1.24.4/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.24.4/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.24.4-client Provides: kubernetes-utils @@ -42,7 +42,7 @@ index 4635bf47..79bd790d 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.24.4-master @@ -51,7 +51,7 @@ index 4635bf47..79bd790d 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.24.4-node Provides: cadvisor @@ -60,7 +60,7 @@ index 4635bf47..79bd790d 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.24.4-kubeadm @@ -69,7 +69,7 @@ index 4635bf47..79bd790d 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.24.4-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.24.4-misc @@ -78,7 +78,7 @@ index 4635bf47..79bd790d 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.24.4-unit-test @@ -88,10 +88,10 @@ index 4635bf47..79bd790d 100644 hostname, rsync, diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/control b/kubernetes/kubernetes-1.25.3/debian/deb_folder/control -index 33e2b16e..b441ac79 100644 +index 350d62cf..f529ca6a 100644 --- a/kubernetes/kubernetes-1.25.3/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.25.3/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.25.3-client Provides: kubernetes-utils @@ -100,7 +100,7 @@ index 33e2b16e..b441ac79 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.25.3-master @@ -109,7 +109,7 @@ index 33e2b16e..b441ac79 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.25.3-node Provides: cadvisor @@ -118,7 +118,7 @@ index 33e2b16e..b441ac79 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.25.3-kubeadm @@ -127,7 +127,7 @@ index 33e2b16e..b441ac79 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.25.3-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.25.3-misc @@ -136,7 +136,7 @@ index 33e2b16e..b441ac79 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.25.3-unit-test @@ -146,10 +146,10 @@ index 33e2b16e..b441ac79 100644 hostname, rsync, diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/control b/kubernetes/kubernetes-1.26.1/debian/deb_folder/control -index 03a3003c..94948c07 100644 +index 71be774c..089d1242 100644 --- a/kubernetes/kubernetes-1.26.1/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.26.1/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.26.1-client Provides: kubernetes-utils @@ -158,7 +158,7 @@ index 03a3003c..94948c07 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.26.1-master @@ -167,7 +167,7 @@ index 03a3003c..94948c07 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.26.1-node Provides: cadvisor @@ -176,7 +176,7 @@ index 03a3003c..94948c07 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.26.1-kubeadm @@ -185,7 +185,7 @@ index 03a3003c..94948c07 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.26.1-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.26.1-misc @@ -194,7 +194,7 @@ index 03a3003c..94948c07 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.26.1-unit-test @@ -204,10 +204,10 @@ index 03a3003c..94948c07 100644 hostname, rsync, diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/control b/kubernetes/kubernetes-1.27.5/debian/deb_folder/control -index cb1081e6..55bb901e 100644 +index f084db2b..ee403b73 100644 --- a/kubernetes/kubernetes-1.27.5/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.27.5/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.27.5-client Provides: kubernetes-utils @@ -216,7 +216,7 @@ index cb1081e6..55bb901e 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.27.5-master @@ -225,7 +225,7 @@ index cb1081e6..55bb901e 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.27.5-node Provides: cadvisor @@ -234,7 +234,7 @@ index cb1081e6..55bb901e 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.27.5-kubeadm @@ -243,7 +243,7 @@ index cb1081e6..55bb901e 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.27.5-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.27.5-misc @@ -252,7 +252,7 @@ index cb1081e6..55bb901e 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.27.5-unit-test @@ -262,10 +262,10 @@ index cb1081e6..55bb901e 100644 hostname, rsync, diff --git a/kubernetes/kubernetes-1.28.4/debian/deb_folder/control b/kubernetes/kubernetes-1.28.4/debian/deb_folder/control -index 1dca8da8..4eed9bdb 100644 +index 16f0838f..77546065 100644 --- a/kubernetes/kubernetes-1.28.4/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.28.4/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.28.4-client Provides: kubernetes-utils @@ -274,7 +274,7 @@ index 1dca8da8..4eed9bdb 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.28.4-master @@ -283,7 +283,7 @@ index 1dca8da8..4eed9bdb 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.28.4-node Provides: cadvisor @@ -292,7 +292,7 @@ index 1dca8da8..4eed9bdb 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.28.4-kubeadm @@ -301,7 +301,7 @@ index 1dca8da8..4eed9bdb 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.28.4-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.28.4-misc @@ -310,7 +310,7 @@ index 1dca8da8..4eed9bdb 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.28.4-unit-test @@ -320,10 +320,10 @@ index 1dca8da8..4eed9bdb 100644 hostname, rsync, diff --git a/kubernetes/kubernetes-1.29.2/debian/deb_folder/control b/kubernetes/kubernetes-1.29.2/debian/deb_folder/control -index ec5491ea..dcc5e6f7 100644 +index 815dda89..1baba07e 100644 --- a/kubernetes/kubernetes-1.29.2/debian/deb_folder/control +++ b/kubernetes/kubernetes-1.29.2/debian/deb_folder/control -@@ -15,7 +15,7 @@ Homepage: http://kubernetes.io/ +@@ -16,7 +16,7 @@ XS-Build-Size: 15GB Package: kubernetes-1.29.2-client Provides: kubernetes-utils @@ -332,7 +332,7 @@ index ec5491ea..dcc5e6f7 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -23,7 +23,7 @@ Description: Kubernetes Command Line Tool +@@ -24,7 +24,7 @@ Description: Kubernetes Command Line Tool The Kubernetes command line tool for interacting with the Kubernetes API. Package: kubernetes-1.29.2-master @@ -341,7 +341,7 @@ index ec5491ea..dcc5e6f7 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, lsb-base, -@@ -44,7 +44,7 @@ Description: Kubernetes services for master host +@@ -45,7 +45,7 @@ Description: Kubernetes services for master host Package: kubernetes-1.29.2-node Provides: cadvisor @@ -350,7 +350,7 @@ index ec5491ea..dcc5e6f7 100644 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, conntrack, -@@ -64,7 +64,7 @@ Description: Kubernetes services for node host +@@ -65,7 +65,7 @@ Description: Kubernetes services for node host issues. Package: kubernetes-1.29.2-kubeadm @@ -359,7 +359,7 @@ index ec5491ea..dcc5e6f7 100644 Depends: ${misc:Depends}, containernetworking-plugins Recommends: ${misc:Recommends}, kubernetes-1.29.2-client Built-Using: ${misc:Built-Using} -@@ -72,7 +72,7 @@ Description: Kubernetes Cluster Bootstrapping Tool +@@ -73,7 +73,7 @@ Description: Kubernetes Cluster Bootstrapping Tool The Kubernetes command line tool for bootstrapping a Kubernetes cluster. Package: kubernetes-1.29.2-misc @@ -368,7 +368,7 @@ index ec5491ea..dcc5e6f7 100644 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: ${misc:Recommends} Built-Using: ${misc:Built-Using} -@@ -80,7 +80,7 @@ Description: dummy package +@@ -81,7 +81,7 @@ Description: dummy package Kubernetes dummy package for misc stuff we don't want to install in production. Package: kubernetes-1.29.2-unit-test diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0008-ceph-add-support-for-arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0008-ceph-add-support-for-arm64.patch index 6c477420..4366afb4 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0008-ceph-add-support-for-arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0008-ceph-add-support-for-arm64.patch @@ -1,4 +1,4 @@ -From a866467b15afb3200e168e5a245316b51210e8e6 Mon Sep 17 00:00:00 2001 +From 0b7ae84562b0c7518d514eba883ceed04f2bc464 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 26 Jul 2023 22:30:09 +0800 Subject: [PATCH 08/12] ceph: add support for arm64 @@ -25,10 +25,10 @@ Signed-off-by: Jackie Huang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph/ceph/debian/deb_folder/control b/ceph/ceph/debian/deb_folder/control -index b8677932..6d8d12ff 100644 +index d5582e0f..363305b3 100644 --- a/ceph/ceph/debian/deb_folder/control +++ b/ceph/ceph/debian/deb_folder/control -@@ -178,7 +178,7 @@ Description: common utilities to mount and interact with a ceph storage cluster +@@ -179,7 +179,7 @@ Description: common utilities to mount and interact with a ceph storage cluster of common tools that allow one to interact with and administer a Ceph cluster. Package: ceph-fuse diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0009-grub-efi-add-support-for-arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0009-grub-efi-add-support-for-arm64.patch index dec6b99b..dc249d27 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0009-grub-efi-add-support-for-arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0009-grub-efi-add-support-for-arm64.patch @@ -1,4 +1,4 @@ -From d1018c38965a4a58e7d8ed735259a880887af814 Mon Sep 17 00:00:00 2001 +From a30997bdbb7fe11531e5229ff037d03c64f6eed1 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 27 Jul 2023 11:19:40 +0800 Subject: [PATCH 09/12] grub-efi: add support for arm64 diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0010-isolcpu-handle-devPath-when-it-doesn-t-exist.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0010-isolcpu-handle-devPath-when-it-doesn-t-exist.patch index 74208151..7beb279f 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0010-isolcpu-handle-devPath-when-it-doesn-t-exist.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0010-isolcpu-handle-devPath-when-it-doesn-t-exist.patch @@ -1,4 +1,4 @@ -From 55b007fcc580559e12d72c53ae39ba0136488b24 Mon Sep 17 00:00:00 2001 +From a5a526beac81c6d6e0a3d33d62cacb1b4f091269 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 6 Dec 2023 17:28:44 +0800 Subject: [PATCH 10/12] isolcpu: handle devPath when it doesn't exist diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0011-Add-image-and-pkg-list-for-arm64.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0011-Add-image-and-pkg-list-for-arm64.patch index 1f7cff22..430affcc 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0011-Add-image-and-pkg-list-for-arm64.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0011-Add-image-and-pkg-list-for-arm64.patch @@ -1,4 +1,4 @@ -From 30290a313d8ffd46939723f390bea8b37e61a2e5 Mon Sep 17 00:00:00 2001 +From 193e7d2ccb4a32be3a10a9a4031f42cdb4bb8e49 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 27 Jul 2023 15:46:40 +0800 Subject: [PATCH 11/12] Add image and pkg list for arm64 diff --git a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0012-kubernetes-unversioned-update-the-checksums.patch b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0012-kubernetes-unversioned-update-the-checksums.patch index 7e27d900..c4ed847c 100644 --- a/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0012-kubernetes-unversioned-update-the-checksums.patch +++ b/scripts/build_inf_debian/meta-patches-arm/stx10.0/cgcs-root/stx/integ/0012-kubernetes-unversioned-update-the-checksums.patch @@ -1,4 +1,4 @@ -From 2ef897d3c2a69ead38d0141502f6c1223424db42 Mon Sep 17 00:00:00 2001 +From b633bf697582f49b0b004af395820fb14ff5f63e Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 16 Oct 2023 17:21:11 +0800 Subject: [PATCH 12/12] kubernetes-unversioned: update the checksums