summaryrefslogtreecommitdiff
path: root/app-containers/docker
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-08 00:14:55 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-08 00:14:55 +0000
commite3a48e635527f3e2d2254e9631f7a5758df9c3fb (patch)
tree7efda32bb4a58c3099db3e763ccaf7cc08e75a50 /app-containers/docker
parent7a027cd18c60d9abad83a60c98ccf27db26be067 (diff)
gentoo auto-resync : 08:01:2023 - 00:14:55
Diffstat (limited to 'app-containers/docker')
-rw-r--r--app-containers/docker/Manifest2
-rw-r--r--app-containers/docker/docker-20.10.22.ebuild7
2 files changed, 7 insertions, 2 deletions
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 8762d261c4cf..360225604c79 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c
-EBUILD docker-20.10.22.ebuild 8002 BLAKE2B 9ff370e1cd0885bc4ac244f0a5978c343f2ae3230d1e2ce0fa31d657d9d3de412880dd0a35dd0118e0e3de48a031fa5290f98bbea6044d169f0dbf5b6f682f74 SHA512 769a98d6ed4618171ff494832a2ae81edbb7e165f63a409a3b6ddb03d29efb772561437cacb8dabd1426989e91c622f48b125d858d9ef2893461cc1cd74e6512
+EBUILD docker-20.10.22.ebuild 8058 BLAKE2B caa8ba3cabfe38c69273ce970c420d69561b73b5b3608a4c576cc151572f901c6a192131be12b1eb8a5bbd8ea114fc37d220eef1a78b68d783b93bed2f2de66c SHA512 966ff3f88054f4717548c88411cfd1415d4d6355a2ea3a4332a909e0b15b0dcb05074fd6d6b31ba8abeb0807b28561b26441d544801e0c4e00f4773184a80c79
MISC metadata.xml 1680 BLAKE2B 6c128f9ea99f1634e260b2f944b6560636d8501f93c3e208aff7ca8ee10199f520b187a063f9a8869130305bef8749ee1af10971658e04515e80907bc8a48be0 SHA512 913bed94f44d2093868999e8a1064c8443e4d1298b53ac065b0df0857809e93194f7650dfa1e49933022461f0adec956effff61f627838e1d0104e9d9004bf14
diff --git a/app-containers/docker/docker-20.10.22.ebuild b/app-containers/docker/docker-20.10.22.ebuild
index 380a03fcecc5..747183b2b483 100644
--- a/app-containers/docker/docker-20.10.22.ebuild
+++ b/app-containers/docker/docker-20.10.22.ebuild
@@ -77,7 +77,6 @@ CONFIG_CHECK="
~USER_NS
~SECCOMP
~CGROUP_PIDS
- ~MEMCG_SWAP
~BLK_CGROUP ~BLK_DEV_THROTTLING
~CGROUP_PERF
@@ -142,6 +141,12 @@ pkg_setup() {
"
fi
+ if kernel_is lt 6 1; then
+ CONFIG_CHECK+="
+ ~MEMCG_SWAP
+ "
+ fi
+
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS