From fc5abf2c49cc393c77312ad031514800cae5f9d4 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 21 Mar 2015 10:38:44 +0000 Subject: Revbump to fix systemd file paths. Bug #543970 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x09BF4F54C2BA7F3C! --- app-emulation/lxc/ChangeLog | 10 +- app-emulation/lxc/Manifest | 36 +++--- app-emulation/lxc/files/lxc_at.service.2 | 6 +- app-emulation/lxc/lxc-1.1.0-r5.ebuild | 196 ------------------------------ app-emulation/lxc/lxc-1.1.0-r6.ebuild | 196 ++++++++++++++++++++++++++++++ app-emulation/lxc/lxc-1.1.1-r1.ebuild | 197 +++++++++++++++++++++++++++++++ app-emulation/lxc/lxc-1.1.1.ebuild | 197 ------------------------------- 7 files changed, 423 insertions(+), 415 deletions(-) delete mode 100644 app-emulation/lxc/lxc-1.1.0-r5.ebuild create mode 100644 app-emulation/lxc/lxc-1.1.0-r6.ebuild create mode 100644 app-emulation/lxc/lxc-1.1.1-r1.ebuild delete mode 100644 app-emulation/lxc/lxc-1.1.1.ebuild (limited to 'app-emulation/lxc') diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog index ac15b6c6bacc..66bae6cdda75 100644 --- a/app-emulation/lxc/ChangeLog +++ b/app-emulation/lxc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/lxc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.72 2015/03/20 21:58:12 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.73 2015/03/21 10:38:38 hwoarang Exp $ + +*lxc-1.1.0-r6 (21 Mar 2015) +*lxc-1.1.1-r1 (21 Mar 2015) + + 21 Mar 2015; Markos Chandras +lxc-1.1.0-r6.ebuild, + +lxc-1.1.1-r1.ebuild, -lxc-1.1.0-r5.ebuild, -lxc-1.1.1.ebuild, + files/lxc_at.service.2: + Revbump to fix systemd file paths. Bug #543970 20 Mar 2015; Markos Chandras -files/lxc.initd.2: Remove unused file diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index c05a98829c93..9a862d9f90e5 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -6,33 +6,33 @@ AUX lxc-1.1.0-fix-gentoo-template.patch 1375 SHA256 f0b765d1b150b18adc3c67fdff6d AUX lxc-1.1.1-shm-tmpfs.patch 1137 SHA256 db2714fe67d8acd1ebc68e196b467f20a548ef60673120c5a0415d282ab29069 SHA512 0d6162ed0b538ca5c9a6f9cf094474b0e084a8989eefb9d8c5c507fdcdb13962f20f2466833f867c41ce39184e9ac7791b49735c39add94deccaecd763a177ec WHIRLPOOL 4598f31a16d2dc0d2a47e720f6f346866570dbe103eeef36e214543667e6126f0a908bae3a983636ed4f154f8bdab5f5bf20595d356b876ae3768de78b9a543d AUX lxc.initd.3 3765 SHA256 2a96156f8d07391ae67d2160199d6ae362889438ac5b48c6c241aa02b9f4928e SHA512 fecefad41640c648bc3923952131e97617bc40bfcaa8b7dce2cac752551ca4c9e126c14febe4c56c04ccb3ebd378a91c5a6fe1d3a8cfcf083186b962e4d43b82 WHIRLPOOL ac64b41aed33c08e3baef74fbacb3895a0566837f3e185315792e5a333e35af72c5c784e890cdbf4480515704b017a97c8ba8e1a256032c50da22c3d63b135d4 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652 -AUX lxc_at.service.2 291 SHA256 ada7e5fa2728d3f2385bd7410c7263ffd789bd2ae6b3c61c6825ad392f71afce SHA512 367e090d0f22d52e5ffe3b06c4d3699e9c2602ad2cd195c5802dd50f58730146bbfe9b13f052067e2ab39d4d94b8ad93a065dd712c6c9d3381f70bcd46525886 WHIRLPOOL de409239a546314928c838701222825d39d9b0af3a8149459cd8c73e0b0eca274a6d6a82c0ac7eb839d8f636fb5094a880adb5e73a1f6be32d7592a1e902252c +AUX lxc_at.service.2 288 SHA256 b2445667b02889a989eb24134e51be4742d121edb319c11d51ebbc61337f1be6 SHA512 f4b9eb1c2917e4f975b5645f56c70457b1b8a11834a2813d7555f169c30a80258b48d9b02119798659ca4c29b3715d5d12a1c9a09369f2b7931bebfe9b95a146 WHIRLPOOL 627f64b2f494be55f77747df9625c2a1ffd64b32679fcceaf981262b19d63fdbb623dd728da37fa4936ec4d3d32e34a12c22fc81e30a1261658187740286e314 DIST lxc-1.0.6.tar.gz 561249 SHA256 2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c SHA512 fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1 WHIRLPOOL 9e77453fbe31523a2e8f39cfaba6f09fef68d00b54549167a0cde56c00934f827f5b4190b9fb64242f36782a9fcda63e6796c35fd47420870c2cee7b9bc0a1c8 DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b78ca39a30f8956b0a8f2 SHA512 e6ff42a7b41177e1be0d2cd47d4c554565c7fc35355f3aa8aeba00d4adc7a0f364ecd060ddb6c97b2fe5968329c4e4c4b3cb022bffd2da145f30880f077264a8 WHIRLPOOL f07e5e9efb8ff394aa9cdd6c3e725b453c8137ec221399cbf910d57dbc9268fc84e7227273567792821415dc14e774942b76a58a1a478de57d5c82e545702000 DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6faee94cda848a0b949155 SHA512 160da88d6dc96cd9f0679f948bfed057c024adcd459fa4b79e872d12284fa3774ac33a13923c6e150072886a371ccfcdf7ab2c4587efa7f6175fc91a67525c4a WHIRLPOOL 2caf81418850ea8b1ecf25b25e799895563ecf1819f32310fcbb4efe88f711eafe2bcb16a0d3b8ee59072c770a5520b4df90a5962215b932e68a4705c4a56d61 DIST lxc-1.1.1.tar.gz 594112 SHA256 64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549 WHIRLPOOL 4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a EBUILD lxc-1.0.6-r1.ebuild 5890 SHA256 1cecb85629b81866f30d6d7309533ef69319778d01a14f85fa8f6b009cbb7782 SHA512 ff4a550cbef9ffff1307677a03d6847bf1840a89e89472347e514d2477ac78d3e48d717f4da44b5810c252882f452cf899af73358ec5f8618145940ca115a9ae WHIRLPOOL 81507999151c7b1494bdf836cf6f59cf626f494b03dbb249155f589358ae1d575ea584967048a8dc67d8885350b48531879c7985fc5e282a38559cc008169452 EBUILD lxc-1.0.7.ebuild 5922 SHA256 91ac06c4a1094697e86ebf85403faa83db155b7c71f5f0d98349cd12ad3770c7 SHA512 e51f9f3705c1c5f01dfdda012c7fe4d178182fb4823e21a65c3518388b7a4464fde44033f8f4240ed4cea2ccc7d9c9151cae7878d0e442b9be8cc418ebf28483 WHIRLPOOL 98102baa34865b5f1e936c8033ba00c10667943fc4697575c8e8c23a8288ffd108cf050964394686175c1b98e605b77a3119408c5e59468dcc4e4a312ddf2697 -EBUILD lxc-1.1.0-r5.ebuild 6069 SHA256 bd59246b75d109769fb269f60a0f08238ffa7d1b1f52c241542282f906178d44 SHA512 b52ad906076edc4bed6cfa2171010c3c6058f17ee280455d4aa258ae441e826e4539096f78934671dd7f73959076697cdac4a677622c91ef5fd0202eecef3cc6 WHIRLPOOL 943cbb39d2f4590e8ef6c521c671186751f2a35da6e7bb04eb1c0ef264fbcb15ea3ca8da1f784c2e161669eac5d987521261363132da260da09571300f67e7e3 -EBUILD lxc-1.1.1.ebuild 6110 SHA256 c7836835a7469b21d08559601c2085ce571fbe2943de1902ee45d53df0a87103 SHA512 c62d282bdfad10b07abb9ca6adda8e0b05dc9a268f9ef371f5347484015024f956bdce4e6435292c813386304d5007fc0bceb51af14f60862f135996f4b71920 WHIRLPOOL 1f082e5e46452fdfbb7822772a00a780fd45b378207c6016484aebf6b385d1f8232e67fff02057e3405619e1cb14bc45d13ab70ee1bec7195a34fe907a8fdb99 -MISC ChangeLog 14775 SHA256 9909a88407ef51e899dbacdefdabdb3edd43a754d76aabdc7000af8442ed091a SHA512 fa9ae87b2b3dc127da17a75746a362863732a03ee650e8e12367ef7ec634d2e1a339caa5fd8cf20a7e776c41889e36b9ae7dd9a8f448525aa51e5e92cdffe911 WHIRLPOOL 4bb695f53c9f9562a121a1f10991ae59547ad6e3d5d93f96d3e7c08da7fca67939611a60f880bb047abc8df13543acc526b34d35f412f04e3d63b61990b3efcd +EBUILD lxc-1.1.0-r6.ebuild 6069 SHA256 1d7f6ddd2cb2f53e62232ac6b5771ccb2d47dc73e03b9972c6f4054dce3b18f5 SHA512 93c99fdf0273ca5944c227ea5faff5bc95dc1cf7b8ffa27343d75122973cebbad5f6e61d012e84c3323308afc95b5ace22f2c28fcc9bf05a979ec9cc884b0a64 WHIRLPOOL eeabc57e26871f5b62a2c236023a17c821d096116a4de7fb82a85f65fc4c81b954bc88e07e453f5286e0600e6b7e30099456a414f599bc26109d2475528fbe71 +EBUILD lxc-1.1.1-r1.ebuild 6113 SHA256 8ffc1e11105fcf49f5500e0c599f1a5bdf296390fbaf9fff14bfa25d577e3140 SHA512 cb8654d0e0870f1eeaa8f86a670cdd18fca83a4ebfd960d377a4f9039d1f0ec5caa53d56c3bcdb5a0c95f677c78e69e87c3cae9397e7b7383bc06c47894773e4 WHIRLPOOL fd623ada9efed907987a91ffc267a8954ecdd63332381d2a188dea346dfdda824ef9c333021f948e7537e43df7089007907686b94429625178ccf1bbedae8927 +MISC ChangeLog 15048 SHA256 905085c907dc6d2a2f89b9f134657d5f78c9b4f81d709c1a23b39196ea99576a SHA512 ba76ecd8221a671ef2676426b1f6220d000f0929454c0c423466fd204f462ee6185504dba6f060662d5f9d9582f36515ce7d020d4b2a54435db5e9a2dda1e5d5 WHIRLPOOL 311e55bcd67b3197f776f8d6562cc9428512b81f0f6377d3de5933d73b17063ea86403ab96c26992bd3e690ab42ee4ea6edafda7c418a56079cc088d4fa3e0a3 MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVDJfzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVDUovXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88w18QAIh8QXm3EwsYYQaqOZlqJ01X -TsHifOAED0ADZkhIkx8vKXZLgE+eJUBxMjkruqkvJX8mjr3ImJQdsYV+V1BNs1eX -mu2VLrw3bqbLv5dPLDmRtM0ygHlTbczIh7MNaxGcZ87Cw3JHxc7VSglHglmUAe8U -xjPSQtewAVR+drObw9qftAaP0vlSuV6SSOd8WqKxyuInlWA0pEBivews5AOktRV3 -1oeth5/gacGumtreDf4hKIoKxajf6nZUxZA1HvzHR2DrhFqxHm/1kBFMElcCngXb -wk0nXJA2XzilJ0abf4HeJoqqMpSP7OcM2rrI+eihQPYHw5EbS7ntt7k3232S1oYj -EN/fwP4/b5w17KVRCFymQxcZuallaFudLNPOumDj9u7XCZy3rKCdTK29odjfiiYu -4oMydO0/d9uYEfWVPxOnzmqaboDKGoAThUQ8icK1Ho20JZBKIZuUDhARarAtr/2t -NPfAtucfwiNbWxJE6ymCE1W7UG6dIUQ0Z3tAcSTFjmSuqe2MZaLq0UI43jdSN9M3 -ilwoFfk8BvG2/4399Euda8nJ63b/RPBfY+EtdL+dHjZMmq9zmRqK6D3SArRUUVLs -0mEeoQu4TazuaOw5vLafIyy5qoqqdJdOdaqyttPKZDB2D7nsLRp+67KnGc8HU9TI -Rz7aQd854rbT1l5ZxMeV -=SAra +OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88fx0QAJfx/Ybm03VVwpUv3W2DZZRD +2R+cGnGPOwtRBwg/G4QKSooMVZwfaMNTb/rWfVqB9VmDivy5NpX7h4SUFDyUHGRO +CFtyK3nV69q1fUmHhKlDHc47OLweLbbUPRcZaCybWQnedRMioSS03YUAdI7vSkp4 +37AT3dZdSkxjaqSntkLtI4LyGObRebhduxPM47+tXWSbsrGHSU/oadpq2NMFkuam +juEPKK8W8s0bY2/B+dHZqS4B/WPNvhv6+Nw7OyDW4fb8dzQhuwaRnniufzTasirR +g1O1EiaN5GdYt2kYX+18yl7YPyZhjs1+ftkiygmSXqtx23gvZQxi7s5645hGguTN +UBRZh8cAGXiYKQ4LTDJgKUD4lsR+g4EGN6mUr2x4mfqeKzKpzGT0ereDFdsXyc0T +r9+atrlENJ9zwECRQVhgaF1rqrSsUOc2jONtZktYq/jKMoam5nTYIyMHHgYNoTd3 +u6fgYdT3QM340Hyle0rZHkpXrZKW73L5KkXMr2qoM4WqAzbbSJHqD6TY/GtpTTXO +9ypg3BRfUGU60V131JpgrCZqvC5JaUfAkvo7hnY1ZQy3IcgB+MxiC1vUXLNmFXXr +05Ijzg+XOAvpwscENZOAtgi/oYcV8cB+Y/bP45YcNPSou7sGmXAGI1Svupo4Zf/9 +atm0ltpzouMEe7TRftBZ +=0Or5 -----END PGP SIGNATURE----- diff --git a/app-emulation/lxc/files/lxc_at.service.2 b/app-emulation/lxc/files/lxc_at.service.2 index 9b92ec6805fe..82306a09ab83 100644 --- a/app-emulation/lxc/files/lxc_at.service.2 +++ b/app-emulation/lxc/files/lxc_at.service.2 @@ -5,9 +5,9 @@ After=network.target [Service] Restart=always ExecStartPre=/usr/libexec/lxc/lxc-devsetup -ExecStart=/usr/sbin/lxc-start -n %i -F -ExecReload=/usr/sbin/lxc-restart -n %i -ExecStop=/usr/sbin/lxc-stop -n %i +ExecStart=/usr/bin/lxc-start -n %i -F +ExecReload=/usr/bin/lxc-restart -n %i +ExecStop=/usr/bin/lxc-stop -n %i Delegate=yes [Install] diff --git a/app-emulation/lxc/lxc-1.1.0-r5.ebuild b/app-emulation/lxc/lxc-1.1.0-r5.ebuild deleted file mode 100644 index 72555016bfb4..000000000000 --- a/app-emulation/lxc/lxc-1.1.0-r5.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r5.ebuild,v 1.2 2015/03/20 21:56:18 hwoarang Exp $ - -EAPI="5" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_2,3_3,3_4} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - - epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch - epatch "${FILESDIR}"/${P}-fix-gentoo-template.patch - - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --docdir=/usr/share/doc/${PF} \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - # Use initd.3 per #517144 - newinitd "${FILESDIR}/${PN}.initd.3" ${PN} - - # lxc-devsetup script - exeinto /usr/libexec/${PN} - doexe config/init/systemd/${PN}-devsetup - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} diff --git a/app-emulation/lxc/lxc-1.1.0-r6.ebuild b/app-emulation/lxc/lxc-1.1.0-r6.ebuild new file mode 100644 index 000000000000..30f609610d71 --- /dev/null +++ b/app-emulation/lxc/lxc-1.1.0-r6.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r6.ebuild,v 1.1 2015/03/21 10:38:38 hwoarang Exp $ + +EAPI="5" + +MY_P="${P/_/-}" +PYTHON_COMPAT=( python{3_2,3_3,3_4} ) +DISTUTILS_OPTIONAL=1 + +inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd + +DESCRIPTION="LinuX Containers userspace utilities" +HOMEPAGE="https://linuxcontainers.org/" +SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" + +KEYWORDS="~amd64 ~arm" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="cgmanager doc examples lua python seccomp" + +RDEPEND="net-libs/gnutls + sys-libs/libcap + cgmanager? ( app-admin/cgmanager ) + lua? ( >=dev-lang/lua-5.1:= ) + python? ( ${PYTHON_DEPS} ) + seccomp? ( sys-libs/libseccomp )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-sgml-utils ) + >=sys-kernel/linux-headers-3.2" + +RDEPEND="${RDEPEND} + sys-process/criu + sys-apps/util-linux + app-misc/pax-utils + virtual/awk" + +CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE + ~CPUSETS ~CGROUP_CPUACCT + ~CGROUP_SCHED + + ~NAMESPACES + ~IPC_NS ~USER_NS ~PID_NS + + ~NETLINK_DIAG ~PACKET_DIAG + ~INET_UDP_DIAG ~INET_TCP_DIAG + ~UNIX_DIAG ~CHECKPOINT_RESTORE + + ~DEVPTS_MULTIPLE_INSTANCES + ~CGROUP_FREEZER + ~UTS_NS ~NET_NS + ~VETH ~MACVLAN + + ~POSIX_MQUEUE + ~!NETPRIO_CGROUP + + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS +" + +ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" + +ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" + +ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" +ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" + +ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" +ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" + +ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" +ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" +ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" +ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" +ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" +ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" + +ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" + +ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." + +ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" + +DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) + +S="${WORKDIR}/${PN}-${MY_P}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +src_prepare() { + + epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch + epatch "${FILESDIR}"/${P}-fix-gentoo-template.patch + + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + if use python; then + #541932 + python_setup "python3*" + export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" + fi + + # I am not sure about the --with-rootfs-path + # /var/lib/lxc is probably more appropriate than + # /usr/lib/lxc. + econf \ + --localstatedir=/var \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --docdir=/usr/share/doc/${PF} \ + --with-config-path=/var/lib/lxc \ + --with-rootfs-path=/var/lib/lxc/rootfs \ + --with-distro=gentoo \ + --with-runtime-path=/run \ + --disable-apparmor \ + $(use_enable cgmanager) \ + $(use_enable doc) \ + $(use_enable examples) \ + $(use_enable lua) \ + $(use_enable python) \ + $(use_enable seccomp) +} + +python_compile() { + distutils-r1_python_compile build_ext -I ../ -L ../${PN} +} + +src_compile() { + default + + if use python; then + pushd "${S}/src/python-${PN}" > /dev/null + distutils-r1_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die + bashcomp_alias ${PN}-start \ + ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} + + if use python; then + pushd "${S}/src/python-lxc" > /dev/null + # Unset DOCS. This has been handled by the default target + unset DOCS + distutils-r1_src_install + popd > /dev/null + fi + + keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc + + find "${D}" -name '*.la' -delete + + # Gentoo-specific additions! + # Use initd.3 per #517144 + newinitd "${FILESDIR}/${PN}.initd.3" ${PN} + + # lxc-devsetup script + exeinto /usr/libexec/${PN} + doexe config/init/systemd/${PN}-devsetup + # Remember to compare our systemd unit file with the upstream one + # config/init/systemd/lxc.service.in + systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service" +} + +pkg_postinst() { + elog "" + elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" + elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" + elog "please add the following to your /etc/lxc/default.conf" + elog "lxc.lxcpath = /etc/lxc" + elog "" + elog "There is an init script provided with the package now; no documentation" + elog "is currently available though, so please check out /etc/init.d/lxc ." + elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" + elog "to start the container defined into /etc/lxc/configname.conf ." + elog "For further information about LXC development see" + elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available + elog "" +} diff --git a/app-emulation/lxc/lxc-1.1.1-r1.ebuild b/app-emulation/lxc/lxc-1.1.1-r1.ebuild new file mode 100644 index 000000000000..a6c11cd2b212 --- /dev/null +++ b/app-emulation/lxc/lxc-1.1.1-r1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.1-r1.ebuild,v 1.1 2015/03/21 10:38:38 hwoarang Exp $ + +EAPI="5" + +MY_P="${P/_/-}" +PYTHON_COMPAT=( python{3_2,3_3,3_4} ) +DISTUTILS_OPTIONAL=1 + +inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd + +DESCRIPTION="LinuX Containers userspace utilities" +HOMEPAGE="https://linuxcontainers.org/" +SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" + +KEYWORDS="~amd64 ~arm" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="cgmanager doc examples lua python seccomp" + +RDEPEND="net-libs/gnutls + sys-libs/libcap + cgmanager? ( app-admin/cgmanager ) + lua? ( >=dev-lang/lua-5.1:= ) + python? ( ${PYTHON_DEPS} ) + seccomp? ( sys-libs/libseccomp )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-sgml-utils ) + >=sys-kernel/linux-headers-3.2" + +RDEPEND="${RDEPEND} + sys-process/criu + sys-apps/util-linux + app-misc/pax-utils + virtual/awk" + +CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE + ~CPUSETS ~CGROUP_CPUACCT + ~CGROUP_SCHED + + ~NAMESPACES + ~IPC_NS ~USER_NS ~PID_NS + + ~NETLINK_DIAG ~PACKET_DIAG + ~INET_UDP_DIAG ~INET_TCP_DIAG + ~UNIX_DIAG ~CHECKPOINT_RESTORE + + ~DEVPTS_MULTIPLE_INSTANCES + ~CGROUP_FREEZER + ~UTS_NS ~NET_NS + ~VETH ~MACVLAN + + ~POSIX_MQUEUE + ~!NETPRIO_CGROUP + + ~!GRKERNSEC_CHROOT_MOUNT + ~!GRKERNSEC_CHROOT_DOUBLE + ~!GRKERNSEC_CHROOT_PIVOT + ~!GRKERNSEC_CHROOT_CHMOD + ~!GRKERNSEC_CHROOT_CAPS +" + +ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" + +ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" + +ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" +ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" + +ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" +ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" + +ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" +ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" +ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" +ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" +ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" +ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" + +ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" + +ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." + +ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" +ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" + +DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) + +S="${WORKDIR}/${PN}-${MY_P}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +src_prepare() { + + epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch + # Fixed in master. It will probably make it to 1.1.2 + epatch "${FILESDIR}"/${P}-shm-tmpfs.patch + + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + if use python; then + #541932 + python_setup "python3*" + export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" + fi + + # I am not sure about the --with-rootfs-path + # /var/lib/lxc is probably more appropriate than + # /usr/lib/lxc. + econf \ + --localstatedir=/var \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --docdir=/usr/share/doc/${PF} \ + --with-config-path=/var/lib/lxc \ + --with-rootfs-path=/var/lib/lxc/rootfs \ + --with-distro=gentoo \ + --with-runtime-path=/run \ + --disable-apparmor \ + $(use_enable cgmanager) \ + $(use_enable doc) \ + $(use_enable examples) \ + $(use_enable lua) \ + $(use_enable python) \ + $(use_enable seccomp) +} + +python_compile() { + distutils-r1_python_compile build_ext -I ../ -L ../${PN} +} + +src_compile() { + default + + if use python; then + pushd "${S}/src/python-${PN}" > /dev/null + distutils-r1_src_compile + popd > /dev/null + fi +} + +src_install() { + default + + mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die + bashcomp_alias ${PN}-start \ + ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} + + if use python; then + pushd "${S}/src/python-lxc" > /dev/null + # Unset DOCS. This has been handled by the default target + unset DOCS + distutils-r1_src_install + popd > /dev/null + fi + + keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc + + find "${D}" -name '*.la' -delete + + # Gentoo-specific additions! + # Use initd.3 per #517144 + newinitd "${FILESDIR}/${PN}.initd.3" ${PN} + + # lxc-devsetup script + exeinto /usr/libexec/${PN} + doexe config/init/systemd/${PN}-devsetup + # Remember to compare our systemd unit file with the upstream one + # config/init/systemd/lxc.service.in + systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service" +} + +pkg_postinst() { + elog "" + elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" + elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" + elog "please add the following to your /etc/lxc/default.conf" + elog "lxc.lxcpath = /etc/lxc" + elog "" + elog "There is an init script provided with the package now; no documentation" + elog "is currently available though, so please check out /etc/init.d/lxc ." + elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" + elog "to start the container defined into /etc/lxc/configname.conf ." + elog "For further information about LXC development see" + elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available + elog "" +} diff --git a/app-emulation/lxc/lxc-1.1.1.ebuild b/app-emulation/lxc/lxc-1.1.1.ebuild deleted file mode 100644 index cd957c04e188..000000000000 --- a/app-emulation/lxc/lxc-1.1.1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.1.ebuild,v 1.2 2015/03/20 21:56:18 hwoarang Exp $ - -EAPI="5" - -MY_P="${P/_/-}" -PYTHON_COMPAT=( python{3_2,3_3,3_4} ) -DISTUTILS_OPTIONAL=1 - -inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="https://linuxcontainers.org/" -SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~arm" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" - -RDEPEND="net-libs/gnutls - sys-libs/libcap - cgmanager? ( app-admin/cgmanager ) - lua? ( >=dev-lang/lua-5.1:= ) - python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-3.2" - -RDEPEND="${RDEPEND} - sys-process/criu - sys-apps/util-linux - app-misc/pax-utils - virtual/awk" - -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~NETLINK_DIAG ~PACKET_DIAG - ~INET_UDP_DIAG ~INET_TCP_DIAG - ~UNIX_DIAG ~CHECKPOINT_RESTORE - - ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN - - ~POSIX_MQUEUE - ~!NETPRIO_CGROUP - - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS -" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" - -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" - -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." - -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" - -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) - -S="${WORKDIR}/${PN}-${MY_P}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - - epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch - # Fixed in master. It will probably make it to 1.1.2 - epatch "${FILESDIR}"/${P}-shm-tmpfs.patch - - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - - if use python; then - #541932 - python_setup "python3*" - export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" - fi - - # I am not sure about the --with-rootfs-path - # /var/lib/lxc is probably more appropriate than - # /usr/lib/lxc. - econf \ - --localstatedir=/var \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --docdir=/usr/share/doc/${PF} \ - --with-config-path=/var/lib/lxc \ - --with-rootfs-path=/var/lib/lxc/rootfs \ - --with-distro=gentoo \ - --with-runtime-path=/run \ - --disable-apparmor \ - $(use_enable cgmanager) \ - $(use_enable doc) \ - $(use_enable examples) \ - $(use_enable lua) \ - $(use_enable python) \ - $(use_enable seccomp) -} - -python_compile() { - distutils-r1_python_compile build_ext -I ../ -L ../${PN} -} - -src_compile() { - default - - if use python; then - pushd "${S}/src/python-${PN}" > /dev/null - distutils-r1_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die - bashcomp_alias ${PN}-start \ - ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} - - if use python; then - pushd "${S}/src/python-lxc" > /dev/null - # Unset DOCS. This has been handled by the default target - unset DOCS - distutils-r1_src_install - popd > /dev/null - fi - - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc - - find "${D}" -name '*.la' -delete - - # Gentoo-specific additions! - # Use initd.3 per #517144 - newinitd "${FILESDIR}/${PN}.initd.3" ${PN} - - # lxc-devsetup script - exeinto /usr/libexec/${PN} - doexe config/init/systemd/${PN}-devsetup - # Remember to compare our systemd unit file with the upstream one - # config/init/systemd/lxc.service.in - systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service" -} - -pkg_postinst() { - elog "" - elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" - elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" - elog "please add the following to your /etc/lxc/default.conf" - elog "lxc.lxcpath = /etc/lxc" - elog "" - elog "There is an init script provided with the package now; no documentation" - elog "is currently available though, so please check out /etc/init.d/lxc ." - elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" - elog "to start the container defined into /etc/lxc/configname.conf ." - elog "For further information about LXC development see" - elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available - elog "" -} -- cgit v1.2.3-65-gdbad