diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-08-13 04:53:10 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-08-13 04:53:10 +0000 |
| commit | 149d30f529aa5c098a7bea70764bc661cf3e813b (patch) | |
| tree | d61a398669ebeb54452047a999f7f93ed80efa0d /app-emulation | |
| parent | Merge with live ebuild. (diff) | |
| download | historical-149d30f529aa5c098a7bea70764bc661cf3e813b.tar.gz historical-149d30f529aa5c098a7bea70764bc661cf3e813b.tar.bz2 historical-149d30f529aa5c098a7bea70764bc661cf3e813b.zip | |
Change CONFIG_USER_NS to only happen for kernels before 3.5. bug #428216
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/libvirt/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emulation/libvirt/Manifest | 4 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-0.9.13-r1.ebuild | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index d1754d52c96b..3f5e9e4db970 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.204 2012/08/13 03:20:22 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.205 2012/08/13 04:53:10 cardoe Exp $ + + 13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13-r1.ebuild: + Change CONFIG_USER_NS to only happen for kernels before 3.5. bug #428216 13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.8.ebuild, -libvirt-0.9.10-r4.ebuild, -libvirt-0.9.11.3.ebuild, diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index d0c722fa1cc7..d0d6e6824fc4 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -9,7 +9,7 @@ DIST libvirt-0.9.13.tar.gz 20276757 SHA256 d124e9915c88c195da9c008a6d855e53e555d EBUILD libvirt-0.9.11.4.ebuild 8717 SHA256 1aa05ff800faac006cc7ac8a1da3978364d302c465452bf2c302b22ffebc9108 SHA512 fdcac516d0ed64aea658fb24c124179bb9c1f597a03ced889c803211baf7c22914eec4e5e9f5940c027d6e36ac8eeecb47eb730daef1372d51df3330e1f965e0 WHIRLPOOL 26a9b6bc50f0547d4bad7bc62008ab7e9284c2c50402e63f24c19bbc6aac8b5a1dce82d03cba595106c48c3de0768f3e3c6ed071bb4b2f2a9dcecdf3786cde53 EBUILD libvirt-0.9.12-r1.ebuild 10353 SHA256 2083781e89483e8dca012ddc71f526380f704cac3acf19dafa2f17d22d35c544 SHA512 45c6de7858d5ec022515f35efd6532fa79db6da1085557457a6c649cec71ed499bf1b692b1af6fd65cb04d12b80ba5e3255331544b49152e82bec8761d80b736 WHIRLPOOL 8f6ceed8eb27dcb905d298caf44a0f78398c36e21576ef6db69a6c499f90330928d4b21e1d065b2a11b9ef782dc694c4995d403f5624fa4e85984481721a9372 EBUILD libvirt-0.9.12.ebuild 10223 SHA256 3559384bb4892a0fdda39a3704a4c8c5ed8e3ad03427924132c89c3350759a9a SHA512 8c6d366cf27a0e65340d1249e6c5b6f7faadbd5402370305a1b8a3097c9e97f1d6df0766fff1a2d96ff5c38db4eaf3ca5de77d4f7325c25dabe94c8417aca160 WHIRLPOOL dbf14226a71296813f91e63d7bb34e223a488e5a3e7d55abc100d2479d2ed444a25e46f646ab56e5c16aabc1f25d5503fc54d299133455cba3b88d4f09e416d6 -EBUILD libvirt-0.9.13-r1.ebuild 10753 SHA256 8815e326d15a96931cd2856e9fd213bc734e3f595a3df230d46d7b8d9bd5f728 SHA512 c84b6321cae653bb37ca67c02a2d93f3a84168e710de66d6998a777adbaad764995a1dcecdf0582254cae2a48862baa7f72848215ff2f00b12eed34862a6697d WHIRLPOOL 51657f47844319b1ccaf3d2dbbad7243b4b565c653d77c87976c636d2879ea601af83aa603fd5456c636db41556b37ae7ec60d2d756451de4733d63d6f2a7d39 +EBUILD libvirt-0.9.13-r1.ebuild 10801 SHA256 e5c05bbfd730a7f67743ff275ffaa9ebb3e83ebc98f938a915c0427fe3b0e219 SHA512 259a87d6c161f56dc1d2d11dd45e96ab5f235d32068ef53f099bb4fe41f3ece6a8476352ca9eaab1022d2bce895ffea9253f1ba04d3abb18143d7713affb7103 WHIRLPOOL 270389d73405c38b1026041195bb4107db7898b798a0c95cfdeca6841925d800890ded9392a4e914cf95d1dfdee228c68227ff9b8d6746344e0503da7b75b7b8 EBUILD libvirt-9999.ebuild 10349 SHA256 62ae9e1daff84437904c87954dd7c5d2dc34a8119e9dffd770fa1515bc757f99 SHA512 06c1e295c455c800e89c6a58a097925cb0912a8e83b0dbdf81351289d3585e23921eb5466ee10511fa13478e7cb1eeb0286521b6d1b7288c48509fa1e0b35228 WHIRLPOOL d94e0f4b7ddd7b1bbbd39f17852e8a9af45cce3b53639e4732bdb3fc193655025cd842d3b613327f26a6da76af5046648744ebaf7ac8f610a4d424c342639e43 -MISC ChangeLog 40384 SHA256 250355b96203aa6f16eaa1b8a51b5134adaf396178459e0e6deb757d452ff167 SHA512 703b0e4f16f96b86523aa9492da1a9b985d1e6180bbb94c4debb2d4c9a7f56cf3f26edfb15f6215a49b079177a68c3a333efa1e37f3423120027544362d1cacf WHIRLPOOL 7596bcab01a7e124066faba080e52998e8a18f7f5665910aad4d8cc32deac063c650a52340af67fe4932ae5b0c001f7ad7a780ef3f3a08a9cd00e2be370eb5d8 +MISC ChangeLog 40536 SHA256 b4fd143ce3d05c78a4ada1c0fa8f29b8c7c08e66802418280936fbae28956381 SHA512 5a6b71ef3539e10eac10432ea598266db07ecb3d705759e11b0bc3f812cb98397ecc9eaafe9d0d04e337c7ae12777cf427d79169f201ac189956ce3832054e80 WHIRLPOOL 3476c9ad5ae74cb48609d78780fb83ec4119767a6a6846a8f8da62634127432995ba0c028d1454c948667664f7754ba73dc1d3caecbd5859d800c882134b8de3 MISC metadata.xml 3420 SHA256 0916b94209d91c7a809069e61f788a9f6115ce9081758a90330f29a3249c9be5 SHA512 8acd907b424ef3500112d5834fba026146636948675381a3a07c1837968f2ebb146b0afa2a9d56225d9af008ade51d46022ba1c03d5e02de0e6e7f3678be4091 WHIRLPOOL c0e4dea1775586184c261a406556eed83f3f26782bfb770e055df8531b0643c62e0f8a6ac3f1243c8cdd1e931f17020d72704178a33e8b5eb4f23f24cf4f7354 diff --git a/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild index ccb76176acfe..15f28e3dfc78 100644 --- a/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild +++ b/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild,v 1.1 2012/08/13 03:17:30 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild,v 1.2 2012/08/13 04:53:10 cardoe Exp $ EAPI=4 @@ -117,7 +117,6 @@ LXC_CONFIG_CHECK=" ~NAMESPACES ~UTS_NS ~IPC_NS - ~USER_NS ~PID_NS ~NET_NS ~DEVPTS_MULTIPLE_INSTANCES @@ -156,6 +155,7 @@ pkg_setup() { CONFIG_CHECK="" use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}" + kernel_is lt 3 5 && use lxc && CONFIG_CHECK+=" ~USER_NS" use macvtap && CONFIG_CHECK+="${MACVTAP}" use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}" if [[ -n ${CONFIG_CHECK} ]]; then |