diff --git a/0008-add-riscv-support.patch b/0008-add-riscv-support.patch index f25c50b34e584aa4c5cabe5d8da3c20367c62aa9..ae10bb3719dd2c1ea2ed704ec22975541aba7765 100644 --- a/0008-add-riscv-support.patch +++ b/0008-add-riscv-support.patch @@ -1,6 +1,65 @@ +diff -ur kubernetes-1.25.3/build/pause/Makefile kubernetes-1.25.3/build/pause/Makefile +--- kubernetes-1.25.3/build/pause/Makefile 2022-10-12 18:47:25.000000000 +0800 ++++ kubernetes-1.25.3/build/pause/Makefile 2023-08-17 11:41:49.498555017 +0800 +@@ -32,7 +32,7 @@ + OUTPUT_TYPE ?= docker + + ALL_OS = linux windows +-ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ++ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x riscv64 + ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) + ALL_ARCH.windows = amd64 + ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022 +@@ -66,6 +66,7 @@ + TRIPLE.linux-arm64 := aarch64-linux-gnu + TRIPLE.linux-ppc64le := powerpc64le-linux-gnu + TRIPLE.linux-s390x := s390x-linux-gnu ++TRIPLE.linux-riscv64 := riscv64-linux-gnu + TRIPLE := ${TRIPLE.${OS}-${ARCH}} + BASE.linux := scratch + # Source for windows pause image base is located at https://github.com/microsoft/windows-pause-image-base +diff -ur kubernetes-1.25.3/cluster/get-kube-binaries.sh kubernetes-1.25.3/cluster/get-kube-binaries.sh +--- kubernetes-1.25.3/cluster/get-kube-binaries.sh 2022-10-12 18:47:25.000000000 +0800 ++++ kubernetes-1.25.3/cluster/get-kube-binaries.sh 2023-08-17 11:42:40.966666276 +0800 +@@ -120,9 +120,12 @@ + s390x*) + CLIENT_ARCH="s390x" + ;; ++ riscv64*) ++ CLIENT_ARCH="riscv64" ++ ;; + *) + echo "Unknown, unsupported architecture (${machine})." >&2 +- echo "Supported architectures x86_64, i686, arm, arm64, ppc64le, s390x." >&2 ++ echo "Supported architectures x86_64, i686, arm, arm64, ppc64le, s390x, riscv64." >&2 + echo "Bailing out." >&2 + exit 3 + ;; +diff -ur kubernetes-1.25.3/cluster/images/etcd/Makefile kubernetes-1.25.3/cluster/images/etcd/Makefile +--- kubernetes-1.25.3/cluster/images/etcd/Makefile 2022-10-12 18:47:25.000000000 +0800 ++++ kubernetes-1.25.3/cluster/images/etcd/Makefile 2023-08-17 11:45:13.814996696 +0800 +@@ -51,7 +51,7 @@ + OUTPUT_TYPE ?= docker + + ALL_OS = linux windows +-ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x ++ALL_ARCH.linux = amd64 arm arm64 ppc64le s390x riscv64 + ALL_OS_ARCH.linux = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch)) + ALL_ARCH.windows = amd64 + ALL_OSVERSIONS.windows := 1809 20H2 ltsc2022 +@@ -106,6 +106,9 @@ + ifeq ($(ARCH),s390x) + BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.3.0 + endif ++ifeq ($(ARCH),riscv64) ++ BASEIMAGE?=registry.k8s.io/build-image/debian-base-riscv64:bullseye-v1.3.0 ++endif + + BASE.windows = mcr.microsoft.com/windows/nanoserver + diff -ur kubernetes-1.25.3/hack/lib/golang.sh kubernetes-1.25.3/hack/lib/golang.sh ---- kubernetes-1.25.3/hack/lib/golang.sh 2023-07-28 16:07:07.873130748 +0800 -+++ kubernetes-1.25.3/hack/lib/golang.sh 2023-07-28 17:02:01.192415345 +0800 +--- kubernetes-1.25.3/hack/lib/golang.sh 2023-08-17 13:18:03.182575731 +0800 ++++ kubernetes-1.25.3/hack/lib/golang.sh 2023-08-18 16:10:37.837869515 +0800 @@ -27,6 +27,7 @@ linux/arm64 linux/s390x @@ -50,14 +109,14 @@ diff -ur kubernetes-1.25.3/hack/lib/golang.sh kubernetes-1.25.3/hack/lib/golang. ;; + "linux/riscv64") + export CGO_ENABLED=1 -+ export CC=${KUBE_LINUX_S390X_CC:-riscv64-linux-gnu-gcc} ++ export CC=${KUBE_LINUX_RISCV64_CC:-riscv64-linux-gnu-gcc} + ;; esac fi diff -ur kubernetes-1.25.3/hack/lib/util.sh kubernetes-1.25.3/hack/lib/util.sh --- kubernetes-1.25.3/hack/lib/util.sh 2022-10-12 18:47:25.000000000 +0800 -+++ kubernetes-1.25.3/hack/lib/util.sh 2023-07-28 16:09:27.117412982 +0800 ++++ kubernetes-1.25.3/hack/lib/util.sh 2023-08-17 11:38:29.206122041 +0800 @@ -185,8 +185,11 @@ ppc64le*) host_arch=ppc64le @@ -73,7 +132,7 @@ diff -ur kubernetes-1.25.3/hack/lib/util.sh kubernetes-1.25.3/hack/lib/util.sh esac diff -ur kubernetes-1.25.3/hack/local-up-cluster.sh kubernetes-1.25.3/hack/local-up-cluster.sh --- kubernetes-1.25.3/hack/local-up-cluster.sh 2022-10-12 18:47:25.000000000 +0800 -+++ kubernetes-1.25.3/hack/local-up-cluster.sh 2023-07-28 16:08:57.429352807 +0800 ++++ kubernetes-1.25.3/hack/local-up-cluster.sh 2023-08-17 11:38:29.206122041 +0800 @@ -316,8 +316,11 @@ ppc64le*) host_arch=ppc64le @@ -87,3 +146,15 @@ diff -ur kubernetes-1.25.3/hack/local-up-cluster.sh kubernetes-1.25.3/hack/local exit 1 ;; esac +diff -ur kubernetes-1.25.3/test/images/image-util.sh kubernetes-1.25.3/test/images/image-util.sh +--- kubernetes-1.25.3/test/images/image-util.sh 2022-10-12 18:47:25.000000000 +0800 ++++ kubernetes-1.25.3/test/images/image-util.sh 2023-08-17 11:47:55.787287782 +0800 +@@ -34,7 +34,7 @@ + source "${KUBE_ROOT}/hack/lib/util.sh" + + # Mapping of go ARCH to actual architectures shipped part of multiarch/qemu-user-static project +-declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["ppc64le"]="ppc64le" ["s390x"]="s390x" ) ++declare -A QEMUARCHS=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["ppc64le"]="ppc64le" ["s390x"]="s390x" ["riscv64"]="riscv64") + + # NOTE(claudiub): In the test image build jobs, this script is not being run in a git repository, + # which would cause git log to fail. Instead, we can use the GIT_COMMIT_ID set in cloudbuild.yaml. diff --git a/kubernetes.spec b/kubernetes.spec index b976165c75b628ba7348c1c6d1e40967e1e34fc4..875fcdcdc5ef5f4bc09e5c23659b2e1e6c29cfdb 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -3,7 +3,7 @@ Name: kubernetes Version: 1.25.3 -Release: 2 +Release: 3 Summary: Container cluster management License: ASL 2.0 URL: https://k8s.io/kubernetes @@ -263,6 +263,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun kubelet kube-proxy %changelog +* Sun Aug 20 2023 zhangxiang - 1.25.3-3 +- DESC:Fix a type error and add riscv64 support + * Fri Jul 28 2023 zhangxiang - 1.25.3-2 - DESC:add riscv64 support