diff --git a/1001-Add-loong64-host-build-support.patch b/1001-Add-loong64-host-build-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..2d93a63495fa2daf47cffd8708aa743d7c4bab7f --- /dev/null +++ b/1001-Add-loong64-host-build-support.patch @@ -0,0 +1,111 @@ +From 45cfa17197d4e92e06f8c8da2f30d76432d5504e Mon Sep 17 00:00:00 2001 +From: wangweijie +Date: Tue, 19 Mar 2024 20:08:26 +0800 +Subject: [PATCH] Add loong64 host build support + +--- + hack/lib/golang.sh | 4 ++++ + hack/lib/util.sh | 5 ++++- + hack/local-up-cluster.sh | 5 ++++- + vendor/github.com/cilium/ebpf/internal/endian_le.go | 4 ++-- + .../runc/libcontainer/system/syscall_linux_64.go | 4 ++-- + 5 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index f3466ff7..29efb1c8 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -27,6 +27,7 @@ readonly KUBE_SUPPORTED_SERVER_PLATFORMS=( + linux/arm64 + linux/s390x + linux/ppc64le ++ linux/loong64 + ) + + # The node platforms we build for +@@ -35,6 +36,7 @@ readonly KUBE_SUPPORTED_NODE_PLATFORMS=( + linux/arm64 + linux/s390x + linux/ppc64le ++ linux/loong64 + windows/amd64 + ) + +@@ -47,6 +49,7 @@ readonly KUBE_SUPPORTED_CLIENT_PLATFORMS=( + linux/arm64 + linux/s390x + linux/ppc64le ++ linux/loong64 + darwin/amd64 + darwin/arm64 + windows/amd64 +@@ -61,6 +64,7 @@ readonly KUBE_SUPPORTED_TEST_PLATFORMS=( + linux/arm64 + linux/s390x + linux/ppc64le ++ linux/loong64 + darwin/amd64 + darwin/arm64 + windows/amd64 +diff --git a/hack/lib/util.sh b/hack/lib/util.sh +index 70568f76..6c9ad7cc 100755 +--- a/hack/lib/util.sh ++++ b/hack/lib/util.sh +@@ -185,8 +185,11 @@ kube::util::host_arch() { + ppc64le*) + host_arch=ppc64le + ;; ++ loongarch64*) ++ host_arch=loong64 ++ ;; + *) +- kube::log::error "Unsupported host arch. Must be x86_64, 386, arm, arm64, s390x or ppc64le." ++ kube::log::error "Unsupported host arch. Must be x86_64, 386, arm, arm64, s390x, ppc64le or loong64." + exit 1 + ;; + esac +diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh +index 83bdd694..15e8338e 100755 +--- a/hack/local-up-cluster.sh ++++ b/hack/local-up-cluster.sh +@@ -292,8 +292,11 @@ function detect_arch { + ppc64le*) + host_arch=ppc64le + ;; ++ loongarch64*) ++ host_arch=loong64 ++ ;; + *) +- echo "Unsupported host arch. Must be x86_64, 386, arm, arm64, s390x or ppc64le." >&2 ++ echo "Unsupported host arch. Must be x86_64, 386, arm, arm64, s390x, ppc64le or loong64." >&2 + exit 1 + ;; + esac +diff --git a/vendor/github.com/cilium/ebpf/internal/endian_le.go b/vendor/github.com/cilium/ebpf/internal/endian_le.go +index 41a68224..62480fb1 100644 +--- a/vendor/github.com/cilium/ebpf/internal/endian_le.go ++++ b/vendor/github.com/cilium/ebpf/internal/endian_le.go +@@ -1,5 +1,5 @@ +-//go:build 386 || amd64 || amd64p32 || arm || arm64 || mipsle || mips64le || mips64p32le || ppc64le || riscv64 +-// +build 386 amd64 amd64p32 arm arm64 mipsle mips64le mips64p32le ppc64le riscv64 ++//go:build 386 || amd64 || amd64p32 || arm || arm64 || mipsle || mips64le || mips64p32le || ppc64le || riscv64 || loong64 ++// +build 386 amd64 amd64p32 arm arm64 mipsle mips64le mips64p32le ppc64le riscv64 loong64 + + package internal + +diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +index 1ed0dba1..ccb9340d 100644 +--- a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go ++++ b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +@@ -1,6 +1,6 @@ +-//go:build linux && (arm64 || amd64 || mips || mipsle || mips64 || mips64le || ppc || ppc64 || ppc64le || riscv64 || s390x) ++//go:build linux && (arm64 || amd64 || mips || mipsle || mips64 || mips64le || ppc || ppc64 || ppc64le || riscv64 || s390x || loong64) + // +build linux +-// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le riscv64 s390x ++// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le riscv64 s390x loong64 + + package system + +-- +2.38.1 + diff --git a/kubernetes.spec b/kubernetes.spec index 60148fa256686fa64f19c302ebe502ae9cd071d3..6697e58dd937da4e170939b1f537b29199b40d29 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -3,7 +3,7 @@ Name: kubernetes Version: 1.29.1 -Release: 1 +Release: 2 Summary: Container cluster management License: ASL 2.0 URL: https://k8s.io/kubernetes @@ -24,6 +24,8 @@ Source13: kubernetes-accounting.conf Source14: kubeadm.conf Source15: kubernetes.conf +Patch1001: 1001-Add-loong64-host-build-support.patch + %description Container cluster management. @@ -261,6 +263,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun kubelet kube-proxy %changelog +* Tue Mar 19 2024 wangweijie - 1.29.1-2 +- DESC:add loong64 host build support + * Tue Feb 20 2024 liuxu - 1.29.1-1 - Type:update - CVE:NA