* [PATCH] docker-ce: allow custom build tags via packageconfig
@ 2020-02-18 22:59 Ricardo Salveti
2020-02-20 17:43 ` [meta-virtualization] " Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Ricardo Salveti @ 2020-02-18 22:59 UTC (permalink / raw)
To: meta-virtualization
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>
---
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 ef84069..3c8a339 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.25.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization] [PATCH] docker-ce: allow custom build tags via packageconfig
2020-02-18 22:59 [PATCH] docker-ce: allow custom build tags via packageconfig Ricardo Salveti
@ 2020-02-20 17:43 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2020-02-20 17:43 UTC (permalink / raw)
To: Ricardo Salveti; +Cc: meta-virtualization
merged.
Bruce
In message: [meta-virtualization] [PATCH] docker-ce: allow custom build tags via packageconfig
on 18/02/2020 Ricardo Salveti wrote:
> 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>
> ---
> 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 ef84069..3c8a339 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.25.0
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-20 17:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-18 22:59 [PATCH] docker-ce: allow custom build tags via packageconfig Ricardo Salveti
2020-02-20 17:43 ` [meta-virtualization] " Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.