mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 07:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: Set libdm_no_deferred_remove

Browse Source 
Apply docker buildtag fixup from docker-1.7.1 (Commit
cd1fc3e4b2db741ed165420b1a4fb072b7690a51)  with a
condition on the lvm2 version, and add arm64 keyword.

Fixes docker-1.10.3 builds for arm64.

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2016-03-29 13:46:39 -07:00
parent e2067e3e6f
commit f5c4b8b591
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
else else
CROS_WORKON_COMMIT="8acee1bc06813191ba5ea396137e1c17a7120bdf" # v1.10.3 + overlay fixes CROS_WORKON_COMMIT="8acee1bc06813191ba5ea396137e1c17a7120bdf" # v1.10.3 + overlay fixes
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64" KEYWORDS="amd64 arm64"
fi fi
inherit bash-completion-r1 eutils linux-info multilib systemd udev user cros-workon inherit bash-completion-r1 eutils linux-info multilib systemd udev user cros-workon
@ -229,6 +229,13 @@ src_compile() {
DOCKER_BUILDTAGS+=' apparmor' DOCKER_BUILDTAGS+=' apparmor'
fi fi
if has_version '<sys-fs/lvm2-2.02.110' ; then
# Docker uses the host files when testing features, so force
# docker to not use dm_task_deferred_remove to cover cross
# builds.
DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'
fi
# https://github.com/docker/docker/pull/13338 # https://github.com/docker/docker/pull/13338
if use experimental; then if use experimental; then
export DOCKER_EXPERIMENTAL=1 export DOCKER_EXPERIMENTAL=1