diff options
| author | Changqing Li <changqing.li@windriver.com> | 2023-09-01 17:03:08 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-09-15 17:28:42 +0000 |
| commit | d673759794b64a5a20be0bb13ce1cc86821cb4de (patch) | |
| tree | 96a9923558a27450c72ea52e35c1d5057d1de3d9 | |
| parent | b8a964fc30de6dfd5a04d3ac57428809526d29f4 (diff) | |
| download | meta-virtualization-d673759794b64a5a20be0bb13ce1cc86821cb4de.tar.gz | |
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 <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-core/packagegroups/packagegroup-container.bb | 2 | ||||
| -rw-r--r-- | recipes-core/packagegroups/packagegroup-kubernetes.bb | 2 |
3 files changed, 6 insertions, 0 deletions
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 4beb3a63..8c5020b3 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=''" | |||
| 29 | 29 | ||
| 30 | S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" | 30 | S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" |
| 31 | 31 | ||
| 32 | COMPATIBLE_HOST:riscv64 = "null" | ||
| 33 | |||
| 32 | do_compile() { | 34 | do_compile() { |
| 33 | export GOARCH="${TARGET_GOARCH}" | 35 | export GOARCH="${TARGET_GOARCH}" |
| 34 | export GOROOT="${STAGING_LIBDIR}/go" | 36 | 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 | |||
| 4 | 4 | ||
| 5 | inherit packagegroup | 5 | inherit packagegroup |
| 6 | 6 | ||
| 7 | COMPATIBLE_HOST:riscv64 = "null" | ||
| 8 | |||
| 7 | PACKAGES = "\ | 9 | PACKAGES = "\ |
| 8 | packagegroup-container \ | 10 | packagegroup-container \ |
| 9 | packagegroup-lxc \ | 11 | 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 | |||
| 4 | 4 | ||
| 5 | inherit packagegroup | 5 | inherit packagegroup |
| 6 | 6 | ||
| 7 | COMPATIBLE_HOST:riscv64 = "null" | ||
| 8 | |||
| 7 | # k3s has this restriction | 9 | # k3s has this restriction |
| 8 | inherit features_check | 10 | inherit features_check |
| 9 | REQUIRED_DISTRO_FEATURES ?= "seccomp" | 11 | REQUIRED_DISTRO_FEATURES ?= "seccomp" |
