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

housekeeping: swap out go-osarchmap in favor of goarch

Browse Source 
Continue work to use go infra in oe-core instead of the support for go
previously found in meta-virt. This is a 1:1 drop in replacement and
removes one more go piece from meta-virt in favor of the common
support found in oe-core.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Mark Asselstine 2017-04-11 13:43:34 -04:00 committed by Bruce Ashfield
parent 752fde1f87
commit a20d51d5c6
8 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
classes/go-osarchmap.bbclass
View File

@ -1,43 +0,0 @@
BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS'), d)}"
BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH'), d)}"
BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}"
HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS'), d)}"
HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}"
HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}"
TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}"
TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}"
TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}"
TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}"
python() {
if d.getVar('TARGET_GOARCH') == 'INVALID':
raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH'))
}
def go_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('p(pc|owerpc)(|64)', a):
return 'powerpc'
else:
return 'INVALID'
def go_map_arm(a, f, d):
import re
if re.match('arm.*', a) and re.match('arm.*7.*', f):
return '7'
return ''
def go_map_os(o, d):
if o.startswith('linux'):
return 'linux'
return o

2
recipes-containers/docker-distribution/docker-distribution_git.bb
View File

@ -13,7 +13,7 @@ PACKAGES =+ "docker-registry"
PV = "v2.6.0-rc+git${SRCPV}"
S = "${WORKDIR}/git/src/github.com/docker/distribution"
inherit go-osarchmap
inherit goarch
inherit go
# This disables seccomp and apparmor, which are on by default in the

2
recipes-containers/docker/docker_git.bb
View File

@ -72,7 +72,7 @@ DOCKER_PKG="github.com/docker/docker"
inherit systemd update-rc.d
inherit go
inherit go-osarchmap
inherit goarch
do_configure[noexec] = "1"

2
recipes-containers/oci-image-tools/oci-image-tools_git.bb
View File

@ -18,7 +18,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit goarch
inherit go
# This disables seccomp and apparmor, which are on by default in the

2
recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
View File

@ -10,7 +10,7 @@ PV = "0.0.1+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit goarch
inherit go
do_compile() {

2
recipes-containers/riddler/riddler_git.bb
View File

@ -9,7 +9,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit goarch
inherit go
# This disables seccomp and apparmor, which are on by default in the

2
recipes-containers/runc/runc.inc
View File

@ -18,7 +18,7 @@ LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer"
do_configure[noexec] = "1"
EXTRA_OEMAKE="BUILDTAGS=''"
inherit go-osarchmap
inherit goarch
do_compile() {
export GOARCH="${TARGET_GOARCH}"

2
recipes-networking/netns/netns_git.bb
View File

@ -9,7 +9,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit goarch
inherit go
do_compile() {