diff options
-rw-r--r-- | classes/go-osarchmap.bbclass | 43 | ||||
-rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/riddler/riddler_git.bb | 2 | ||||
-rw-r--r-- | recipes-containers/runc/runc.inc | 2 | ||||
-rw-r--r-- | recipes-networking/netns/netns_git.bb | 2 |
8 files changed, 7 insertions, 50 deletions
diff --git a/classes/go-osarchmap.bbclass b/classes/go-osarchmap.bbclass deleted file mode 100644 index 058bf642..00000000 --- a/classes/go-osarchmap.bbclass +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | BUILD_GOOS = "${@go_map_os(d.getVar('BUILD_OS'), d)}" | ||
2 | BUILD_GOARCH = "${@go_map_arch(d.getVar('BUILD_ARCH'), d)}" | ||
3 | BUILD_GOTUPLE = "${BUILD_GOOS}_${BUILD_GOARCH}" | ||
4 | HOST_GOOS = "${@go_map_os(d.getVar('HOST_OS'), d)}" | ||
5 | HOST_GOARCH = "${@go_map_arch(d.getVar('HOST_ARCH'), d)}" | ||
6 | HOST_GOARM = "${@go_map_arm(d.getVar('HOST_ARCH'), d.getVar('TUNE_FEATURES'), d)}" | ||
7 | HOST_GOTUPLE = "${HOST_GOOS}_${HOST_GOARCH}" | ||
8 | TARGET_GOOS = "${@go_map_os(d.getVar('TARGET_OS'), d)}" | ||
9 | TARGET_GOARCH = "${@go_map_arch(d.getVar('TARGET_ARCH'), d)}" | ||
10 | TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'), d)}" | ||
11 | TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}" | ||
12 | GO_BUILD_BINDIR = "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == d.getVar('HOST_GOTUPLE',True)]}" | ||
13 | |||
14 | python() { | ||
15 | if d.getVar('TARGET_GOARCH') == 'INVALID': | ||
16 | raise bb.parse.SkipPackage('Cannot map `%s` to a go architecture' % d.getVar('TARGET_ARCH')) | ||
17 | } | ||
18 | |||
19 | def go_map_arch(a, d): | ||
20 | import re | ||
21 | if re.match('i.86', a): | ||
22 | return '386' | ||
23 | elif a == 'x86_64': | ||
24 | return 'amd64' | ||
25 | elif re.match('arm.*', a): | ||
26 | return 'arm' | ||
27 | elif re.match('aarch64.*', a): | ||
28 | return 'arm64' | ||
29 | elif re.match('p(pc|owerpc)(|64)', a): | ||
30 | return 'powerpc' | ||
31 | else: | ||
32 | return 'INVALID' | ||
33 | |||
34 | def go_map_arm(a, f, d): | ||
35 | import re | ||
36 | if re.match('arm.*', a) and re.match('arm.*7.*', f): | ||
37 | return '7' | ||
38 | return '' | ||
39 | |||
40 | def go_map_os(o, d): | ||
41 | if o.startswith('linux'): | ||
42 | return 'linux' | ||
43 | return o | ||
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index 07920b9f..08b6d70b 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb | |||
@@ -13,7 +13,7 @@ PACKAGES =+ "docker-registry" | |||
13 | PV = "v2.6.0-rc+git${SRCPV}" | 13 | PV = "v2.6.0-rc+git${SRCPV}" |
14 | S = "${WORKDIR}/git/src/github.com/docker/distribution" | 14 | S = "${WORKDIR}/git/src/github.com/docker/distribution" |
15 | 15 | ||
16 | inherit go-osarchmap | 16 | inherit goarch |
17 | inherit go | 17 | inherit go |
18 | 18 | ||
19 | # This disables seccomp and apparmor, which are on by default in the | 19 | # This disables seccomp and apparmor, which are on by default in the |
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 6b73cf3d..74170cbf 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -72,7 +72,7 @@ DOCKER_PKG="github.com/docker/docker" | |||
72 | 72 | ||
73 | inherit systemd update-rc.d | 73 | inherit systemd update-rc.d |
74 | inherit go | 74 | inherit go |
75 | inherit go-osarchmap | 75 | inherit goarch |
76 | 76 | ||
77 | do_configure[noexec] = "1" | 77 | do_configure[noexec] = "1" |
78 | 78 | ||
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 125362bb..29a89266 100644 --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb | |||
@@ -18,7 +18,7 @@ PV = "0.1.0+git${SRCPV}" | |||
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
21 | inherit go-osarchmap | 21 | inherit goarch |
22 | inherit go | 22 | inherit go |
23 | 23 | ||
24 | # This disables seccomp and apparmor, which are on by default in the | 24 | # This disables seccomp and apparmor, which are on by default in the |
diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb index 176860ec..4f77dced 100644 --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | |||
@@ -10,7 +10,7 @@ PV = "0.0.1+git${SRCPV}" | |||
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | inherit go-osarchmap | 13 | inherit goarch |
14 | inherit go | 14 | inherit go |
15 | 15 | ||
16 | do_compile() { | 16 | do_compile() { |
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb index 51599803..ae6c5ec9 100644 --- a/recipes-containers/riddler/riddler_git.bb +++ b/recipes-containers/riddler/riddler_git.bb | |||
@@ -9,7 +9,7 @@ PV = "0.1.0+git${SRCPV}" | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | inherit go-osarchmap | 12 | inherit goarch |
13 | inherit go | 13 | inherit go |
14 | 14 | ||
15 | # This disables seccomp and apparmor, which are on by default in the | 15 | # This disables seccomp and apparmor, which are on by default in the |
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index 41baf739..4808547b 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc | |||
@@ -18,7 +18,7 @@ LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" | |||
18 | do_configure[noexec] = "1" | 18 | do_configure[noexec] = "1" |
19 | EXTRA_OEMAKE="BUILDTAGS=''" | 19 | EXTRA_OEMAKE="BUILDTAGS=''" |
20 | 20 | ||
21 | inherit go-osarchmap | 21 | inherit goarch |
22 | 22 | ||
23 | do_compile() { | 23 | do_compile() { |
24 | export GOARCH="${TARGET_GOARCH}" | 24 | export GOARCH="${TARGET_GOARCH}" |
diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb index f41ff701..641d55fc 100644 --- a/recipes-networking/netns/netns_git.bb +++ b/recipes-networking/netns/netns_git.bb | |||
@@ -9,7 +9,7 @@ PV = "0.1.0+git${SRCPV}" | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | inherit go-osarchmap | 12 | inherit goarch |
13 | inherit go | 13 | inherit go |
14 | 14 | ||
15 | do_compile() { | 15 | do_compile() { |