summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-07-22 17:20:52 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-07-22 17:20:52 -0400
commit7d41ad142db239fd7280c51b369f906e255619b1 (patch)
treeefd4ba093d471ecaca0e17474a10e5d4e6a64254
parent59c338afc3124d11656366b7e1dbdba279e21422 (diff)
downloadmeta-virtualization-7d41ad142db239fd7280c51b369f906e255619b1.tar.gz
docker: fix GNU hash QA warning
The docker build isn't properly using CFLAGS/LDFLAGS, which triggers the following QA error: ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary: 'docker/1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0/packages-split/docker/usr/bin/docker' [ldflags] ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: QA run found fatal errors. Please consider fixing them ERROR: docker-1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0 do_package_qa: Function failed: do_package_qa ERROR: Logfile of failure stored in: tmp/work/core2-64-overc-linux/docker/1.11.1+git5604cbed50d51c4039b1abcb1cf87c4e01bce924-r0/temp/log.do_package_qa.63906 ERROR: Task meta-virtualization/recipes-containers/docker/docker_git.bb:do_package_qa (meta-virtualization/recipes-containers/docker/docker_git.bb:do_package_qa) failed with exit code '1' Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/docker/docker_git.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 46321b4b..97700f02 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -85,8 +85,8 @@ do_compile() {
85 # Pass the needed cflags/ldflags so that cgo 85 # Pass the needed cflags/ldflags so that cgo
86 # can find the needed headers files and libraries 86 # can find the needed headers files and libraries
87 export CGO_ENABLED="1" 87 export CGO_ENABLED="1"
88 export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" 88 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
89 export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" 89 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
90 # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 90 # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056
91 export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper' 91 export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper'
92 92