commit:     ac37ed8532c005c8b940650a46abfc9339f7655e
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 00:45:07 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 00:45:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac37ed85

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 <AT> gentoo.org>

 app-emulation/docker/docker-19.03.13.ebuild | 12 +++++-------
 1 file 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 dad2dd92986..e1df62c680d 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
 }
 

Reply via email to