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

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

[Ming Liu]

From: Ricardo Salveti <ricardo@foundries.io>

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 <ricardo@foundries.io>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-containers/docker/docker-ce_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 817795f..2746e3f 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
 
-- 
2.26.0

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

[Bruce Ashfield]

Cherry picked to Zeus.

Bruce

In message: [meta-virtualization][zeus][PATCH] docker-ce: allow custom build tags via packageconfig
on 09/04/2020 liu.ming50@gmail.com wrote:

> From: Ricardo Salveti <ricardo@foundries.io>
> 
> 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 <ricardo@foundries.io>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
>  recipes-containers/docker/docker-ce_git.bb | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
> index 817795f..2746e3f 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
>  
> -- 
> 2.26.0
>