diff options
Diffstat (limited to 'app-emulation/lxc')
| -rw-r--r-- | app-emulation/lxc/Manifest | 7 | ||||
| -rw-r--r-- | app-emulation/lxc/lxc-4.0.5.ebuild (renamed from app-emulation/lxc/lxc-4.0.4.ebuild) | 53 | ||||
| -rw-r--r-- | app-emulation/lxc/metadata.xml | 2 |
3 files changed, 32 insertions, 30 deletions
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index b3ae849b0669..a09381c71196 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -2,6 +2,7 @@ AUX lxc-2.0.5-omit-sysconfig.patch 259 BLAKE2B 977e151fbb8c9d98e89aaa5ee0426e64a AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea091c8475ac9a8c4adfb45918c044f6c49d9b9bce546082907d696f697baf0870893c4427abeafa496db89f99190cd091 SHA512 2f3728fcf5e88eecc1ae05bf038ef83baa375194c5bef0d0ef68feaf4d8092cdd8efef6b3c27207c4abd28b085f087af517242c65747b47d0a8fa840f6b9d279 AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650fe7f1b26a4dcdc17158b7e449d666e2103047d9f196e53df8beca15fffd529fa8e743de97bd82 SHA512 1182b53a65399746f6d6bced0df5c1fde09c1ede4a28bfe95b5ed0bbd969d6f6423f63021d4b6f1dc62c7b2703f6963c03d881291650bdf21cfcf8432586c1b4 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb -DIST lxc-4.0.4.tar.gz 844684 BLAKE2B 438f9c79787cfab493a159a03dad214519b979c192264cb4acff21174f5642e2c10a899504ed2ac697906ca1ea9ad5cd92e01dbb8c6420651e7130b56022032a SHA512 5c5bb3c474b37284e862cbaf35daab01be7606992eb101cbea7097951ccee81dad8ab8d2624ba5f62279ece17889b1245fd6b2b63e8b17ed728560c5d40309b2 -EBUILD lxc-4.0.4.ebuild 4456 BLAKE2B c26e22262670697ab2a6ce7603e30d0099a24ebdf7de6b837083b9de1ba5f36e6a21017b3f6b70ed07f86e26665203621b53914cd8bda46498600706de0b4271 SHA512 d17b79efa51025432f3eb30d7bd475a859908956bacbad7e3a671a84b8b747d0527e50fea399d79bca17855c4b6fb0336d2e91fd2c161893616645e1635ac91d -MISC metadata.xml 729 BLAKE2B 6a5aba03814f55593fa026ff4f057061bd1462ec3cc99cbf30b425f0be8ae7be8d4457c4b36b68f71385c2517069ba1ac0cc4b921255ea2b431cad1fb55c372d SHA512 5c33f871ece2f6c3e4128c5121df423e191724f2569032a2d991fe3a5578b68e9a7de89ebd60e186f0cef6470f8152fe451a818459d0a451a4dee914567871cd +DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335 SHA512 d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f +DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5 SHA512 9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700 +EBUILD lxc-4.0.5.ebuild 4713 BLAKE2B 243d987f01fcea8136be0debdc1def7686d4eaa82417c65f14ff08c932f6930ed58076445aad0a9175fc66ffd94f0414cf28e97b4c6afeed816192513ca7cf06 SHA512 48e02eb24c0ae6d1f373a4bd6e6fd986a4d7388d98f8a1665b2c1f59553baed2d0b92346a5b7ecca0b384b8b2fd034024491464cad2aaee5927870ff39c8f5c4 +MISC metadata.xml 663 BLAKE2B 4e6b34cc41c0ff68c3c5867e4c81277e82255512678c495879114a9c51b3a0eb50f6f7a514752e27c2aea8215b2241c255a4a7b6258c73927cbc3f112d9985f1 SHA512 05813d7ee6a5e1ec6558b3ade26452e9cbdbaa94479ed320f0b7db9af27e7bc32543e6fad5543746b21b6983158090cff55b826d219a4f66a51264949d95f0ff diff --git a/app-emulation/lxc/lxc-4.0.4.ebuild b/app-emulation/lxc/lxc-4.0.5.ebuild index fe6b7eea0236..2613f38a5180 100644 --- a/app-emulation/lxc/lxc-4.0.4.ebuild +++ b/app-emulation/lxc/lxc-4.0.5.ebuild @@ -3,18 +3,18 @@ EAPI=7 -inherit autotools bash-completion-r1 linux-info flag-o-matic pam readme.gentoo-r1 systemd +inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig DESCRIPTION="LinuX Containers userspace utilities" HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc" SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz - https://github.com/lxc/lxc/archive/${P}.tar.gz" + verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" LICENSE="LGPL-3" SLOT="0" -IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools" +IUSE="apparmor +caps doc examples libressl man pam seccomp selinux +ssl +tools verify-sig" RDEPEND="app-misc/pax-utils sys-apps/util-linux @@ -29,32 +29,31 @@ RDEPEND="app-misc/pax-utils libressl? ( dev-libs/libressl:0= ) )" DEPEND="${RDEPEND} - >=app-text/docbook-sgml-utils-0.6.14-r2 - >=sys-kernel/linux-headers-3.2 + >=sys-kernel/linux-headers-4 apparmor? ( sys-apps/apparmor )" -BDEPEND="doc? ( app-doc/doxygen )" -PDEPEND="templates? ( app-emulation/lxc-templates )" +BDEPEND="doc? ( app-doc/doxygen ) + man? ( app-text/docbook-sgml-utils ) + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" CONFIG_CHECK="~!NETPRIO_CGROUP ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE - ~CGROUP_FREEZER + ~CGROUP_SCHED ~CPUSETS ~IPC_NS - ~MACVLAN + ~MEMCG ~NAMESPACES ~NET_NS - ~PID_NS + ~POSIX_MQUEUE ~USER_NS ~UTS_NS - ~VETH" ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" @@ -76,7 +75,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854 ) -S="${WORKDIR}/lxc-${P}" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc src_prepare() { default @@ -86,8 +85,6 @@ src_prepare() { src_configure() { append-flags -fno-strict-aliasing - # --enable-doc is for manpages which is why we don't link it to a "doc" - # USE flag. We always want man pages. local myeconfargs=( --bindir=/usr/bin --localstatedir=/var @@ -111,7 +108,6 @@ src_configure() { --enable-bash --enable-commands - --enable-doc --enable-memfd-rexec --enable-thread-safety @@ -119,6 +115,7 @@ src_configure() { $(use_enable caps capabilities) $(use_enable doc api-docs) $(use_enable examples) + $(use_enable man doc) $(use_enable pam) $(use_enable seccomp) $(use_enable selinux) @@ -151,21 +148,25 @@ src_install() { systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service" DOC_CONTENTS=" - For openrc, there is an init script provided with the package. - You _should_ only need to symlink /etc/init.d/lxc to - /etc/init.d/lxc.configname to start the container defined in - /etc/lxc/configname.conf. - - Correspondingly, for systemd a service file lxc@.service is installed. - Enable and start lxc@configname in order to start the container defined - in /etc/lxc/configname.conf. - - If you want checkpoint/restore functionality, please install criu - (sys-process/criu)." + For openrc, there is an init script provided with the package. + You should only need to symlink /etc/init.d/lxc to + /etc/init.d/lxc.configname to start the container defined in + /etc/lxc/configname.conf. + + Correspondingly, for systemd a service file lxc@.service is installed. + Enable and start lxc@configname in order to start the container defined + in /etc/lxc/configname.conf." DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc } pkg_postinst() { readme.gentoo_print_elog + + elog "Please run 'lxc-checkconfig' to see optional kernel features." + elog + elog "Optional uninstalled dependencies:" + optfeature "automatic template scripts" app-emulation/lxc-templates + optfeature "Debian-based distribution container image support" dev-util/debootstrap + optfeature "snapshot & restore functionality" sys-process/criu } diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml index 20b6c295215f..67a46103842c 100644 --- a/app-emulation/lxc/metadata.xml +++ b/app-emulation/lxc/metadata.xml @@ -11,7 +11,7 @@ </maintainer> <use> <flag name="apparmor">Enable AppArmor support</flag> - <flag name="templates">Install old style templates through <pkg>app-emulation/lxc-templates</pkg></flag> + <flag name="man">Build manpages</flag> <flag name="tools">Build and install additional command line tools</flag> </use> <upstream> |