merged to master-next

With any luck, I'll complete my release testing and master-next
will become master shortly

Bruce

In message: [meta-virtualization][PATCH v2] classes/image-oci: Map image 
architecture correctly
on 30/10/2023 Joshua Watt wrote:

> OCI requires that the architecture [1] be a valid GOARCH [2]. To
> correctly perform this mapping, use the go library code from OE core.
> 
> [1]: 
> https://github.com/opencontainers/image-spec/blob/main/config.md#properties
> [2]: https://go.dev/doc/install/source#environment
> 
> Signed-off-by: Joshua Watt <[email protected]>
> ---
>  classes/image-oci.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/image-oci.bbclass b/classes/image-oci.bbclass
> index 9ddb88b..0ec5c48 100644
> --- a/classes/image-oci.bbclass
> +++ b/classes/image-oci.bbclass
> @@ -52,7 +52,7 @@ OCI_IMAGE_AUTHOR_EMAIL ?= "${PATCH_GIT_USER_EMAIL}"
>  OCI_IMAGE_TAG ?= "latest"
>  OCI_IMAGE_RUNTIME_UID ?= ""
>  
> -OCI_IMAGE_ARCH ?= "${TARGET_ARCH}"
> +OCI_IMAGE_ARCH ?= "${@oe.go.map_arch(d.getVar('TARGET_ARCH'))}"
>  OCI_IMAGE_SUBARCH ?= "${@oci_map_subarch(d.getVar('TARGET_ARCH'), 
> d.getVar('TUNE_FEATURES'), d)}"
>  
>  OCI_IMAGE_ENTRYPOINT ?= "sh"
> -- 
> 2.34.1
> 

> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8414): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8414
Mute This Topic: https://lists.yoctoproject.org/mt/102282594/21656
Group Owner: [email protected]
Unsubscribe: 
https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy
 [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to