From 8f25bfcbae987ed3b1bed82d6d9f937f3739362f Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 1 Sep 2023 17:03:08 +0800 Subject: oci-image-tools: don't build for riscv64 Currently oci-image-tools has a do_compile error for riscv64. The problem could be reproduced by: MACHINE=qemuriscv64 bitbake oci-image-tools So explicitly set COMPATIBLE_HOST here to avoid it building for riscv64. When someone interested in using this recipe for riscv64 fixes the compile issue, this setting could be removed. Also don't build packagegroup-container/packagegroup-kubernetes since they depends on oci-image-tools Signed-off-by: Changqing Li Signed-off-by: Bruce Ashfield --- recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 ++ recipes-core/packagegroups/packagegroup-container.bb | 2 ++ recipes-core/packagegroups/packagegroup-kubernetes.bb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb index 878d4cc7..b925a2a7 100644 --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb @@ -29,6 +29,8 @@ EXTRA_OEMAKE="BUILDTAGS=''" S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" +COMPATIBLE_HOST:riscv64 = "null" + do_compile() { export GOARCH="${TARGET_GOARCH}" export GOROOT="${STAGING_LIBDIR}/go" diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb index 8d418e95..c41576a3 100644 --- a/recipes-core/packagegroups/packagegroup-container.bb +++ b/recipes-core/packagegroups/packagegroup-container.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup +COMPATIBLE_HOST:riscv64 = "null" + PACKAGES = "\ packagegroup-container \ packagegroup-lxc \ diff --git a/recipes-core/packagegroups/packagegroup-kubernetes.bb b/recipes-core/packagegroups/packagegroup-kubernetes.bb index 70dc9713..7e6937b1 100644 --- a/recipes-core/packagegroups/packagegroup-kubernetes.bb +++ b/recipes-core/packagegroups/packagegroup-kubernetes.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup +COMPATIBLE_HOST:riscv64 = "null" + # k3s has this restriction inherit features_check REQUIRED_DISTRO_FEATURES ?= "seccomp" -- cgit v1.2.3-54-g00ecf