From b19fe49b67c3835ba88131bf79c2f7f07c8b24e9 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Tue, 18 Feb 2020 19:59:13 -0300 Subject: docker-ce: allow custom build tags via packageconfig As done by the docker-moby recipe, move the definition of the default build tags outside do_compile and let the docker build tags be customized via the packageconfig options set by the recipe. This is required for enabling seccomp support during build time. Signed-off-by: Ricardo Salveti Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker-ce_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-containers/docker') diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index ef840697..3c8a339f 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb @@ -44,6 +44,8 @@ PV = "${DOCKER_VERSION}+git${SRCREV_docker}" PACKAGES =+ "${PN}-contrib" DOCKER_PKG="github.com/docker/docker" +# in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 +BUILD_TAGS = "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" inherit go inherit goarch @@ -71,8 +73,7 @@ do_compile() { export CGO_ENABLED="1" export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" - # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 - export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper' + export DOCKER_BUILDTAGS='${BUILD_TAGS} ${PACKAGECONFIG_CONFARGS}' export DISABLE_WARN_OUTSIDE_CONTAINER=1 -- cgit v1.2.3-54-g00ecf