commit:     fe199693ea3b2b99a9e2639dcd86b537f3db1ec6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 13:24:30 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 13:30:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe199693

app-containers/lxc: add 6.0.3

 - drop 'lto' use flag in favor of handling it via meson.eclass.

Closes: https://bugs.gentoo.org/941602
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxc/Manifest         |   2 +
 app-containers/lxc/lxc-6.0.3.ebuild | 168 ++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index ab6eb81347c6..2a3b5e654810 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -2,3 +2,5 @@ DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 
533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc2
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B 
c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb
 SHA512 
a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
 DIST lxc-6.0.2.tar.gz 964007 BLAKE2B 
55c0155a66194d4d10fff5ffc7edc6d6afab730245a401671f8d1bd6f54bd8558bd0644c0f42bd49b5b470bc343809091f1893c27b5830674870f6b91f23d6e0
 SHA512 
52841b5f48eeb4b2b63e0437e3abc38cec6a801778eb2fab264c78d7ee3be957bd45aa839c9fcd281396464fa0af84bb2fc8bf4bfadc9509fae3b4dc52b44da5
 DIST lxc-6.0.2.tar.gz.asc 833 BLAKE2B 
b4b6b56e65239c2125864e16e947a88c2d4d97a1b2dfa6920ca5c2f89b3df7d44d9ec8eb9a56753d6009143a53f6bb5bbd13f3b5b7f26e537aa6f1f1d0d0cc85
 SHA512 
741caccb3dc0ef1043c04122c75a3e3f6d8e6024a65bf905b186da0aabef971a1224e60f9adee069d1a2c24f43c408be1ccc32e5d4faba85860e9a19d9e4c0d9
+DIST lxc-6.0.3.tar.gz 964210 BLAKE2B 
8d5dec7f088111a2ca82aadd6cd90eb30a3a1b61900aa47123caba2ff95d10e68cfcd6a94ec6b3e36657777578c8b113c95aad9112b48b9dc964e4ed73783b48
 SHA512 
4ed41155b74afa135ae8e01f55a8cbbc7284a80e9789aaa2e69264d6b90a6527baf51f9c68dd3364aa83e7939d070f5c7dad924c751927783e883adce539fbdf
+DIST lxc-6.0.3.tar.gz.asc 833 BLAKE2B 
3a23eacfdd248a95c9fa41a6edcb55abb07abc81314fa227649663ac264a9e5fdcf81cb38b79f1bd51b9172a70a0aee5bf65ecfdaf438c944c25f11c882ab562
 SHA512 
5de32e772bd2864e3b688a90fd9f08d98829d61ba3e1cc76a9b403fc005256149f55ad034e186c3329f3abe52a8815f60c5027b16de46be0bc81b14d0134babd

diff --git a/app-containers/lxc/lxc-6.0.3.ebuild 
b/app-containers/lxc/lxc-6.0.3.ebuild
new file mode 100644
index 000000000000..804d6c7d0bee
--- /dev/null
+++ b/app-containers/lxc/lxc-6.0.3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info meson optfeature systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc";
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+       verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc 
)"
+
+LICENSE="GPL-2 LGPL-2.1 LGPL-3"
+SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while 
bumping.
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor +caps examples io-uring man pam seccomp selinux ssl systemd 
test +tools"
+
+RDEPEND="acct-group/lxc
+       acct-user/lxc
+       apparmor? ( sys-libs/libapparmor )
+       caps? ( sys-libs/libcap )
+       io-uring? ( >=sys-libs/liburing-2:= )
+       pam? ( sys-libs/pam )
+       seccomp? ( sys-libs/libseccomp )
+       selinux? ( sys-libs/libselinux )
+       ssl? ( dev-libs/openssl:0= )
+       systemd? (
+               sys-apps/dbus
+               sys-apps/systemd:=
+       )
+       tools? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+       caps? ( sys-libs/libcap[static-libs] )
+       tools? ( sys-libs/libcap[static-libs] )
+       sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig
+       man? ( app-text/docbook2X )
+       verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+RESTRICT="!test? ( test )"
+
+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"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) 
networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
+
+pkg_setup() {
+       linux-info_pkg_setup
+}
+
+src_configure() {
+
+       # -Dtools-multicall=false: will create a single binary called 'lxc' 
that conflicts with LXD.
+       local emesonargs=(
+               --localstatedir "${EPREFIX}/var"
+
+               -Dcoverity-build=false
+               -Dinstall-state-dirs=false
+               -Doss-fuzz=false
+               -Dspecfile=false
+               -Dtools-multicall=false
+
+               -Dcommands=true
+               -Dinstall-init-files=true
+               -Dmemfd-rexec=true
+               -Dthread-safety=true
+
+               $(meson_use apparmor)
+               $(meson_use caps capabilities)
+               $(meson_use examples)
+               $(meson_use io-uring io-uring-event-loop)
+               $(meson_use man)
+               $(meson_use pam pam-cgroup)
+               $(meson_use seccomp)
+               $(meson_use selinux)
+               $(meson_use ssl openssl)
+               $(meson_use test tests)
+               $(meson_use tools)
+
+               $(usex systemd -Ddbus=true -Ddbus=false)
+               $(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
+
+               -Ddata-path=/var/lib/lxc
+               -Ddoc-path=/usr/share/doc/${PF}
+               -Dlog-path=/var/log/lxc
+               -Drootfs-mount-path=/var/lib/lxc/rootfs
+               -Druntime-path=/run
+       )
+
+       use tools && local emesonargs+=( -Dcapabilities=true )
+
+       meson_src_configure
+}
+
+src_install() {
+       meson_src_install
+
+       # The main bash-completion file will collide with lxd, need to relocate 
and update symlinks.
+       local lxcbashcompdir="${D}/$(get_bashcompdir)"
+       mkdir -p "${lxcbashcompdir}" || die "Failed to create bashcompdir."
+       mv "${lxcbashcompdir}"/_lxc "${lxcbashcompdir}"/lxc-start || die 
"Failed to move _lxc bash completion file."
+
+       # Build system will install all bash completion files regardless of our 
'tools' use flag.
+       # Though installing them all will add bash completions for commands 
that don't exist, it's
+       # cleaner than dealing with individual files based on the use flag 
status.
+       bashcomp_alias lxc-start 
lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,update-config,usernsexec,wait}
+
+       find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+       # Replace upstream sysvinit/systemd files.
+       if use systemd ; then
+               rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to 
remove systemd lib dir"
+       else
+               rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to 
remove sysvinit scripts"
+       fi
+
+       newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
+       systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 
lxc-monitord.service
+       systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
+       systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
+       systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "[email protected]"
+
+       if ! use apparmor; then
+               sed -i '/lxc-apparmor-load/d' 
"${D}$(systemd_get_systemunitdir)/lxc.service" ||
+                       die "Failed to remove apparmor references from 
lxc.service systemd unit."
+       fi
+}
+
+pkg_postinst() {
+       elog "Please refer to "
+       elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage 
guide."
+       elog
+       elog "Run 'lxc-checkconfig' to see optional kernel features."
+       elog
+
+       optfeature "creating your own LXC containers" 
app-containers/distrobuilder
+       optfeature "automatic template scripts" app-containers/lxc-templates
+       optfeature "Debian-based distribution container image support" 
dev-util/debootstrap
+       optfeature "snapshot & restore functionality" sys-process/criu
+}

Reply via email to