From 7d66b0cc41110ef81fb94dc3bc6411b9570e5f12 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 20 Mar 2017 21:59:10 -0400 Subject: go: replace explicit go-cross* with inherit go bbclass 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 --- recipes-containers/docker-distribution/docker-distribution_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'recipes-containers/docker-distribution') diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index e86d4ff9..b8181c7a 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb @@ -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 -- cgit v1.2.3-54-g00ecf