diff options
author | Anoop Karollil <anoop.karollil@ge.com> | 2019-07-25 11:04:50 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-07-30 22:08:26 -0400 |
commit | a23a7d6dcaa4eb1f2f46be9177cbdf56ec7e89dd (patch) | |
tree | 4620824820e75e3cfc1e7c812da19cbd3a54b0d7 | |
parent | 822bedbaf672772af946fc2fa0205b917db8e948 (diff) | |
download | meta-virtualization-a23a7d6dcaa4eb1f2f46be9177cbdf56ec7e89dd.tar.gz |
docker: Define override-able BUILD_TAGS
DOCKER_BUILDTAGS has tags that exclude btrfs and devicemapper graph
drivers. To enable either, the tags have to be removed, but this isn't
easily possible as DOCKER_BUILDTAGS can't be overridden via a
bbappend.
Define a BUILD_TAGS variable in the docker recipe that is set with the
exclude tags, and use it for setting DOCKER_BUILDTAGS. This makes it
possible for downstream to tweak BUILD_TAGS/DOCKER_BUILD_TAGS via a
bbappend.
Signed-off-by: Anoop Karollil <anoop.karollil@ge.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index feca5362..e45f87e0 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -63,6 +63,8 @@ PV = "${DOCKER_VERSION}+git${SRCREV_moby}" | |||
63 | PACKAGES =+ "${PN}-contrib" | 63 | PACKAGES =+ "${PN}-contrib" |
64 | 64 | ||
65 | DOCKER_PKG="github.com/docker/docker" | 65 | DOCKER_PKG="github.com/docker/docker" |
66 | # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 | ||
67 | BUILD_TAGS = "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" | ||
66 | 68 | ||
67 | inherit go | 69 | inherit go |
68 | inherit goarch | 70 | inherit goarch |
@@ -91,8 +93,7 @@ do_compile() { | |||
91 | export CGO_ENABLED="1" | 93 | export CGO_ENABLED="1" |
92 | export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" | 94 | export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" |
93 | export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" | 95 | export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" |
94 | # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 | 96 | export DOCKER_BUILDTAGS='${BUILD_TAGS} ${PACKAGECONFIG_CONFARGS}' |
95 | export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${PACKAGECONFIG_CONFARGS}' | ||
96 | 97 | ||
97 | export DISABLE_WARN_OUTSIDE_CONTAINER=1 | 98 | export DISABLE_WARN_OUTSIDE_CONTAINER=1 |
98 | 99 | ||