diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
| commit | b17a3ef12038de50228bade1f05502c74e135321 (patch) | |
| tree | 9026dffec53f92cba48ca9a500a4f778e6304380 /app-emulation/docker | |
| parent | 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff) | |
gentoo resync : 02.09.2020
Diffstat (limited to 'app-emulation/docker')
| -rw-r--r-- | app-emulation/docker/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/docker/docker-19.03.12.ebuild | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 6a8afafb41d2..751b72c212b2 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,3 +1,3 @@ DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3 -EBUILD docker-19.03.12.ebuild 8404 BLAKE2B 592424738f7faa2033904c135b9c2710208262414e677e94b0b45391ddbfb2430d46be641a703bc23645c0635d47685a5e3704460e971ad419467386fa460c9e SHA512 5121e71b234370ce920960e1e0c09fb21074d69518a3e87fd11d636e8f3aba0c2a47d420ccce580b0802d0eef0147c9c63d2fa51717cb1a95f7f572ab9eb7f3d +EBUILD docker-19.03.12.ebuild 8466 BLAKE2B 6537d7d5adba8122814efc90943f6497e84f5f6da9e4345eddfba5e53f72684879b9ace45046402c2d3efaa5cd5baa46fabebc99c3bba37a4a8faacbc5ce2c9c SHA512 9b8cf5724a855998eeecc453b412e010e08c0614972024ea842d9b842a3593680f2e4d65396c83e32a50f511deab307e6aaaa6c00b967fbd542124223f41fdb0 MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa diff --git a/app-emulation/docker/docker-19.03.12.ebuild b/app-emulation/docker/docker-19.03.12.ebuild index c0cea011dfbf..319ca92ef6cf 100644 --- a/app-emulation/docker/docker-19.03.12.ebuild +++ b/app-emulation/docker/docker-19.03.12.ebuild @@ -14,7 +14,7 @@ else DOCKER_GITCOMMIT=48a66213fe MY_PV=${PV/_/-} SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" inherit golang-vcs-snapshot fi @@ -82,7 +82,7 @@ CONFIG_CHECK=" ~USER_NS ~SECCOMP ~CGROUP_PIDS - ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + ~MEMCG_SWAP ~BLK_CGROUP ~BLK_DEV_THROTTLING ~CGROUP_PERF @@ -158,6 +158,12 @@ pkg_setup() { " fi + if kernel_is lt 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + if use aufs; then CONFIG_CHECK+=" ~AUFS_FS |