Skip to contentSkip to conversation

docker-ce: allow custom build tags via packageconfig

PATCH In review Ming Liu 2 participants 2 messages Apr 9, 2020 – Apr 13, 2020

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

PATCH 1/1 docker-ce: allow custom build tags via packageconfig

From: Ricardo Salveti <[email protected]>

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.

---
 recipes-containers/docker/docker-ce_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +3 -2
index 817795f..2746e3f 100644
@@ -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
 
Signature · 1 line
2.26.0
#1 lore raw

Cherry picked to Zeus.

Bruce

In message: [meta-virtualization][zeus][PATCH] docker-ce: allow custom build tags via packageconfig

Quoted 40 lines · on 09/04/2020 [email protected] wrote:

From: Ricardo Salveti <[email protected]>

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.

---
 recipes-containers/docker/docker-ce_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +3 -2
index 817795f..2746e3f 100644
@@ -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
 
Signature · 1 line
2.26.0