Check if CPUSETS are enabled in kernel wrt bug #536546 by Dirk Best <mail@dirk-best...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 6251df242e41e2fe3a6a462a2f1a74b1d37dede1..f998fbf238adffc4d7f46d9e1798ae1d78c0b37e 100644 (file)
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.40 2015/03/03 14:21:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.41 2015/03/14 02:47:43 xarthisius Exp $
+
+  14 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.5.0.ebuild:
+  Check if CPUSETS are enabled in kernel wrt bug #536546 by Dirk Best <mail
+  @dirk-best.de>. Thanks to Tianon <admwiggin@gmail.com> for reporting and
+  fixing it upstream
 
   03 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.5.0.ebuild,
   metadata.xml:

diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index f6f97493f6e38ffbe829974706a84479e741c877..5167277d8ae0bce5c26427fc709381ba56d60a2f 100644 (file)
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -5,23 +5,23 @@ AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
-EBUILD docker-1.5.0.ebuild 6814 SHA256 bb5aae2db67a8e9b7ad1edbcbb2e0b4b2190ca8b2bbeab9f68b6923137ca1dcc SHA512 6ff82386222ad2df9fc627e74432b0c154cacedbc7c41c371ff92bf6b91a63dfde0eb3f4b79c7c728b86db24472c1b50be06eda88ed9e759d85387501a092d55 WHIRLPOOL 71af45b75bfa4f7674d9acb7667dd9803df21a1bc72a261bb20fd0b922d0a73df8837cc802ccb3d6217466490b7a04b2893252c16a816f98ddb3bd44e2e3fa47
-MISC ChangeLog 6534 SHA256 e7c240f846c7eab7dacae7129610b14bb594e838eef5ddd00bd22c9f26f4c972 SHA512 5d64534e96973d4986d26ad5c6e2bd7196441d51246fb95208e0a58d2153f525ff11ce6a9c377e955cea0458e95dcdbb9d629bbc9708f1347dca833b6d1ea813 WHIRLPOOL 3a10eecca331d0f613f85bdc9c8137923bc9c0d3fb6cfd5f12151e69873b97d99858a4d23e367d3de2c47c8c7396822c86ce30cb8fd9ba17a479e71cc2f4f647
+EBUILD docker-1.5.0.ebuild 6822 SHA256 19f5e21476163342094b3de4571c6cb04e9cb5a6759cbcf7fa5b69055a34e977 SHA512 5629aa2ae6402a75fcd94278e1e107c6ce529db7764d8bfd3e9f4f656b0e59f3901769b9ca4126e2ce822d9b3b73cf217a39c7bd302b3b7f21288804525e611e WHIRLPOOL ddb1cdaff5c6393434b129df788e4df9062e43a22904dea89dfa72a68af889ec9071b062c97ae7bd758e111774afca181418e5e7c306b07efb1d6ba872cf115c
+MISC ChangeLog 6782 SHA256 978459139ff0fcce58615be18ee0a4b497e549dacd50b938379419858ba71364 SHA512 a6d25661a202379c3fad882e24f8d5a4696f4ba5941f309cf61c10396d0fe43fd4f857d172a731b150ac1f8533270fdc5bc9f91c96e7005f92eec85fa4965426 WHIRLPOOL c93f53b1389e5880f6dade143b98b4bbb43b877b0dd580e2e6c685f71fed18c048d847ef939fb2b99f20ebc719b3612e1a46e8caf76daf8d9028dc8f90caa8a8
 MISC metadata.xml 1404 SHA256 47b10fac828cc7c80f752c786452104d924bee553c0e6f95e8de5de585ef832d SHA512 e88b6183842f53cec880671f2c9785b1690917f4214f13f521747cc968f6be9cad0a5b09ca36705b69a168b8c4db4271f754c345f4042f5baccbd249e80eaed1 WHIRLPOOL 8c9dc0c496e788fed2fcffb826cbadbd8d4646fcfff5e807dc0946b360b15a833fbdb4d2bf45cd54e771d783ddd747f4ded575ee2e3e99998da774505e39e596
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9cNzAAoJEF0huFKJUZL5nnsP/0V55iVY8dN3i80WPWUTNPJx
-Bk+OjbWqdvwrO3RWzDVXIDh8PF8K6XhewIEm1pJcbtk5aMkRvtWqLRyLYvovEb+h
-krSIJEF2w6HD3zgBuBMEu+oe85TV0Eaz/CtW0UJKkuGLZgzu93rVUkKcXx0Wzzzx
-2E/cqqvkgyu3qwOwCPbfXxLSHu/6kbZJG7QHI9o1jydmwiBfkCVkcb5+Bm+7iDhw
-hboiL1xPao4WInAsSOAZ6X5TqdKjkMS6oPiIv7+S44DEFyvp+dB4MbklfoWW41iU
-PA4plKCUhIh9hkORwCG+vzEatILjm4cFfAIkKS9/42JL+c67eec/NOAoqB/U3pbo
-sD+7aJbSXgFWWrUnFh3QrTqKg5b0DbOUNjVyucBC8NkmBwFIwTKLzVjzelCF4gLo
-0Ys9oP7Ec5lYS+De2D19DFeQHigeqK7n25v0a15KS5Tmnx8Vymy8x73P5+S6sjSh
-vvUIM+H4lzbrHMMMDLsHftbmWo4agpN2NV9d9AalBsMzgrzpbkDHlKS6KvWPgozB
-ZTvVwtgbQJ7WLn83kQzbc68SbMzOROtMCxYDAXdXWA0R3hvPqPV9U1vKDbATIkhO
-UZ8aClOVm80ch0pHeacn2vCx2tCZ+7xkuYqXfkK/rZph8mufJfNzM8VtZkTG0U6l
-eAV7xjeBPV7kU7EJC6si
-=iZ62
+iQIcBAEBCAAGBQJVA6FTAAoJEF0huFKJUZL5ZzEP/08BIylLDoPABs522c1ZVxNu
+yQLln4ocMYZHEJED+k5Z6OYjmzRyKva9sFNVr80DUdMxkvCnqBY0u82FAP4LLnKM
+0jyuG3VHkSQa+3o/WqDL/optNTQUT8xTZA3+Ehpp//7+ZQzH5FEvkc8QptjZRmQK
+weM9AVoRwo0uJPs517I12uC+w5CGmKYiej7AYNJ2aoJ7/Hus4QzX5O0GAxPlP2Ub
+mPf5gRslyC7UX70p1zsP+4etEg7e6Rb2mVlNvCWn9Kg1q+xqH1L53tpmErpf/d93
+Fh0AqNBbAbQ38wMIvvdMdBgE7NtdU7ZCAsCj/yvQ8xd0a2z0oyjERIPeeRiYBFbz
+TT7Qwf0alqZ9Rba5HXKYSeVg+b+42eyeW4ZmFN7TdidgvC9raHz8Pz018x5AcJKt
+tu3Z+Nj8fNKL09sBxfaYzeIPvuLe5V2wYiSgit0iDjo1yU6kNIaLN5QG9pl59i8X
+PvHG2gIdOpFlC3j3GrLWYwWYHQv11vn6gY+qavuH+UFjRo3raW3MFw4YjuqlaYuQ
+gGFYWbFeZZa061XULMBkTivwBziv5DSLXbMVFhiZl8hl5BSw0DTxPtivVofSGKxB
+fjNKdjk6J55YwWipgG7vDH1PVnOUeZ6akmubDD6lYDF8hicD9FJSKkeCCrI35Hw/
+urIJ5Btj+VJakBixVDP+
+=9yCE
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/docker/docker-1.5.0.ebuild b/app-emulation/docker/docker-1.5.0.ebuild
index c54d46fee7f8c98bef5ca7606a732ba676f9290d..825a067df03c4fd806f550e4e3795cea248a41a4 100644 (file)
--- a/app-emulation/docker/docker-1.5.0.ebuild
+++ b/app-emulation/docker/docker-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.3 2015/03/03 14:21:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.4 2015/03/14 02:47:43 xarthisius Exp $
 
 EAPI=5
 
@@ -73,7 +73,7 @@ RESTRICT="installsources strip"
 CONFIG_CHECK="
        ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
        ~DEVPTS_MULTIPLE_INSTANCES
-       ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER CGROUP_SCHED
+       ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER CGROUP_SCHED CPUSETS
        ~MACVLAN ~VETH ~BRIDGE
        ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
        ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK