Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/
Date: Tue, 29 Dec 2020 07:43:27
Message-Id: 1609227792.e40859c2f4f845cabad357e90b51e99b72d842e5.juippis@gentoo
1 commit: e40859c2f4f845cabad357e90b51e99b72d842e5
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 07:29:35 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 07:43:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40859c2
7
8 app-emulation/docker: clarify ERROR_AUFS_FS check
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 app-emulation/docker/docker-19.03.13-r2.ebuild | 2 +-
13 app-emulation/docker/docker-19.03.14.ebuild | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild
17 index 0e9fcd9f79b..b4de621c665 100644
18 --- a/app-emulation/docker/docker-19.03.13-r2.ebuild
19 +++ b/app-emulation/docker/docker-19.03.13-r2.ebuild
20 @@ -170,7 +170,7 @@ pkg_setup() {
21 ~AUFS_FS
22 ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
23 "
24 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
25 + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
26 fi
27
28 if use btrfs; then
29
30 diff --git a/app-emulation/docker/docker-19.03.14.ebuild b/app-emulation/docker/docker-19.03.14.ebuild
31 index fa355dcabb8..7524b7a23f4 100644
32 --- a/app-emulation/docker/docker-19.03.14.ebuild
33 +++ b/app-emulation/docker/docker-19.03.14.ebuild
34 @@ -170,7 +170,7 @@ pkg_setup() {
35 ~AUFS_FS
36 ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
37 "
38 - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
39 + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
40 fi
41
42 if use btrfs; then