MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

image-oci: map architectures using local function

Browse Source 
commit 115f636 [classes/image-oci: Map image architecture correctly]
fixes architecture mapping, but uses a library function that isn't
available in nanbield.

We make a local copy of that go_arch mapping function and maintain
it locally, so we fix the architecture mapping exactly the same
way.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-11-07 14:14:54 +00:00
parent 11d15351a2
commit 0c785e1100
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
classes/image-oci.bbclass
View File

@ -52,7 +52,7 @@ OCI_IMAGE_AUTHOR_EMAIL ?= "${PATCH_GIT_USER_EMAIL}"
OCI_IMAGE_TAG ?= "latest"
OCI_IMAGE_RUNTIME_UID ?= ""
OCI_IMAGE_ARCH ?= "${@oe.go.map_arch(d.getVar('TARGET_ARCH'))}"
OCI_IMAGE_ARCH ?= "${@oci_map_arch(d.getVar('TARGET_ARCH'), d)}"
OCI_IMAGE_SUBARCH ?= "${@oci_map_subarch(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
OCI_IMAGE_ENTRYPOINT ?= "sh"
@ -74,6 +74,39 @@ OCI_IMAGE_ENV_VARS ?= ""
# bundled into a tarball.
OCI_IMAGE_TAR_OUTPUT ?= "true"
# this is from goarch.bbclass. We currently can't inherit
# the entire goarch bbclass, so we duplicate the function
# here. This moves to a library function in newer releases
# so we no longer need this.
def oci_map_arch(a, d):
import re
if re.match('i.86', a):
return '386'
elif a == 'x86_64':
return 'amd64'
elif re.match('arm.*', a):
return 'arm'
elif re.match('aarch64.*', a):
return 'arm64'
elif re.match('mips64el.*', a):
return 'mips64le'
elif re.match('mips64.*', a):
return 'mips64'
elif a == 'mips':
return 'mips'
elif a == 'mipsel':
return 'mipsle'
elif re.match('p(pc|owerpc)(64le)', a):
return 'ppc64le'
elif re.match('p(pc|owerpc)(64)', a):
return 'ppc64'
elif a == 'riscv64':
return 'riscv64'
elif a == 'loongarch64':
return 'loong64'
else:
raise bb.parse.SkipRecipe("Unsupported CPU architecture: %s" % a)
# Generate a subarch that is appropriate to OCI image
# types. This is typically only ARM architectures at the
# moment.