Cherry picked to Mickledore. Bruce
On Wed, Sep 13, 2023 at 10:03 PM Changqing Li <[email protected]> wrote: > > > On 9/4/23 11:05, Bruce Ashfield wrote: > > CAUTION: This email comes from a non Wind River email account! > > Do not click links or open attachments unless you recognize the sender and > > know the content is safe. > > > > Since riscv isn't tested with meta-virt at all, this isn't > > the only recipe that has either build or runtime issues. > > > > This is staged to master-next. > > > > Bruce > > > > In message: [meta-virtualization] [PATCH] oci-image-tools: don't build for > > riscv64 > > on 01/09/2023 Changqing Li wrote: > > Hi, Bruce > > Could you also merge this to mickledore branch, thanks. > > //Changqing > > >> From: Changqing Li <[email protected]> > >> > >> 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 <[email protected]> > >> --- > >> 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 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=''" > >> > >> 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" > >> -- > >> 2.25.1 > >> > >> > >> -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8310): https://lists.yoctoproject.org/g/meta-virtualization/message/8310 Mute This Topic: https://lists.yoctoproject.org/mt/101090972/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
