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

go: replace explicit go-cross* with inherit go bbclass

Browse Source 
Rather than expliciting depending on go-cross-${TARGET_ARCH}, we
can now simply inherit the oe-core go bbclass. This gets us the
correct go dependencies and other variables properly set.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2017-03-20 21:59:10 -04:00
parent a050e7a61d
commit 7d66b0cc41
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,6 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
DEPENDS = "go-cross-${TARGET_ARCH} \
"
SRCREV_distribution="0810eba2adf048b77621472991211924d9ec31c5"
SRC_URI = "git://github.com/docker/distribution.git;branch=master;name=distribution;destsuffix=git/src/github.com/docker/distribution \
file://docker-registry.service \
@ -17,6 +14,7 @@ PV = "v2.6.0-rc+git${SRCPV}"
S = "${WORKDIR}/git/src/github.com/docker/distribution"
inherit go-osarchmap
inherit go
# This disables seccomp and apparmor, which are on by default in the
# go package.
@ -32,6 +30,7 @@ do_compile() {
export CFLAGS=""
export LDFLAGS=""
export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
export GO_GCFLAGS=""
export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
oe_runmake binaries

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

@ -3,7 +3,7 @@ SUMMARY = "A collection of tools for working with the OCI image format specifica
LICENSE = "Apache-2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
DEPENDS = "go-cross-${TARGET_ARCH} \
DEPENDS = "\
oci-image-spec \
oci-runtime-spec \
go-digest \
@ -19,6 +19,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit go
# This disables seccomp and apparmor, which are on by default in the
# go package.

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

@ -2,7 +2,6 @@ HOMEPAGE = "https://github.com/opencontainers/runtime-tools"
SUMMARY = "oci-runtime-tool is a collection of tools for working with the OCI runtime specification"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b355a61a394a504dacde901c958f662c"
DEPENDS = "go-cross-${TARGET_ARCH}"
SRC_URI = "git://github.com/opencontainers/runtime-tools.git"
@ -12,6 +11,7 @@ PV = "0.0.1+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit go
do_compile() {
export GOARCH="${TARGET_GOARCH}"

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

@ -2,7 +2,6 @@ HOMEPAGE = "https://github.com/jfrazelle/riddler"
SUMMARY = "Convert `docker inspect` to opencontainers (OCI compatible) runc spec."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=20ce4c6a4f32d6ee4a68e3a7506db3f1"
DEPENDS = "go-cross-${TARGET_ARCH}"
SRC_URI = "git://github.com/jfrazelle/riddler;branch=master"
SRCREV = "23befa0b232877b5b502b828e24161d801bd67f6"
@ -11,6 +10,7 @@ PV = "0.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit go-osarchmap
inherit go
# This disables seccomp and apparmor, which are on by default in the
# go package.