summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-22 17:45:07 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-22 17:45:07 -0700
commitac37ed8532c005c8b940650a46abfc9339f7655e (patch)
tree42ac5ffad8e9b6aa94e1269c0890f3d79898f1f8
parentapp-emulation/docker: fix minor typo (diff)
downloadgentoo-ac37ed8532c005c8b940650a46abfc9339f7655e.tar.gz
gentoo-ac37ed8532c005c8b940650a46abfc9339f7655e.tar.bz2
gentoo-ac37ed8532c005c8b940650a46abfc9339f7655e.zip
app-emulation/docker: don't enable obsolete overlay driver by default
overlay2 is preferred over it. overlay2 is built unconditionally and is default storage graph driver. https://docs.docker.com/storage/storagedriver/overlayfs-driver/ Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--app-emulation/docker/docker-19.03.13.ebuild12
1 files changed, 5 insertions, 7 deletions
diff --git a/app-emulation/docker/docker-19.03.13.ebuild b/app-emulation/docker/docker-19.03.13.ebuild
index dad2dd92986c..e1df62c680d7 100644
--- a/app-emulation/docker/docker-19.03.13.ebuild
+++ b/app-emulation/docker/docker-19.03.13.ebuild
@@ -24,7 +24,7 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker
HOMEPAGE="https://www.docker.com/"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp selinux"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
BDEPEND="
@@ -89,6 +89,10 @@ CONFIG_CHECK="
~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
~IPVLAN
~MACVLAN ~DUMMY
+
+ ~OVERLAY_FS
+ ~EXT4_FS_SECURITY
+ ~EXT4_FS_POSIX_ACL
"
ERROR_KEYS="CONFIG_KEYS: is mandatory"
@@ -179,12 +183,6 @@ pkg_setup() {
"
fi
- if use overlay; then
- CONFIG_CHECK+="
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
- "
- fi
-
linux-info_pkg_setup
}