From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8C56158041 for ; Fri, 5 Apr 2024 13:24:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5F4AE2A04; Fri, 5 Apr 2024 13:24:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7D2CE2A04 for ; Fri, 5 Apr 2024 13:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5BBF343140 for ; Fri, 5 Apr 2024 13:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C7DD167F for ; Fri, 5 Apr 2024 13:24:19 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1712323457.1e1b278d4fd7e09720ef65bb83d16c91d032f7c5.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/lxc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/lxc/lxc-6.0.0-r1.ebuild app-containers/lxc/lxc-6.0.0.ebuild X-VCS-Directories: app-containers/lxc/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 1e1b278d4fd7e09720ef65bb83d16c91d032f7c5 X-VCS-Branch: master Date: Fri, 5 Apr 2024 13:24:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 57fbdcf2-e0a5-4c65-9691-9d79e951773d X-Archives-Hash: 71b89a68056b461f0b04adad98ec839c commit: 1e1b278d4fd7e09720ef65bb83d16c91d032f7c5 Author: Joonas Niilola gentoo org> AuthorDate: Fri Apr 5 13:21:29 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Apr 5 13:24:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1b278d app-containers/lxc: flip -Dinstall-init-files from false to true - it installs more files, under /etc/default, /usr/libexec, etc, that may be important to some users. Signed-off-by: Joonas Niilola gentoo.org> app-containers/lxc/{lxc-6.0.0.ebuild => lxc-6.0.0-r1.ebuild} | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app-containers/lxc/lxc-6.0.0.ebuild b/app-containers/lxc/lxc-6.0.0-r1.ebuild similarity index 94% rename from app-containers/lxc/lxc-6.0.0.ebuild rename to app-containers/lxc/lxc-6.0.0-r1.ebuild index 7452b2ec74ca..64d7aef60e47 100644 --- a/app-containers/lxc/lxc-6.0.0.ebuild +++ b/app-containers/lxc/lxc-6.0.0-r1.ebuild @@ -74,7 +74,6 @@ pkg_setup() { src_configure() { - # -Dinstall-init-files=false: prefer our own files from ${FILESDIR} # -Dtools-multicall=false: will create a single binary called 'lxc' that conflicts with LXD. local emesonargs=( --localstatedir "${EPREFIX}/var" @@ -82,13 +81,13 @@ src_configure() { -Ddbus=true -Dcoverity-build=false - -Dinstall-init-files=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 @@ -139,6 +138,13 @@ src_install() { 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