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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06AF9158089 for ; Mon, 16 Oct 2023 19:56:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DE132BC01D; Mon, 16 Oct 2023 19:56:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0DAC72BC01D for ; Mon, 16 Oct 2023 19:56:38 +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 CC1D6335D2B for ; Mon, 16 Oct 2023 19:56:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B696921 for ; Mon, 16 Oct 2023 19:56:36 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1697485993.d33ffb6d7f392fffac72589ae99580f97a847eff.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/lvm2-2.03.22-r1.ebuild sys-fs/lvm2/lvm2-2.03.22-r2.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d33ffb6d7f392fffac72589ae99580f97a847eff X-VCS-Branch: master Date: Mon, 16 Oct 2023 19:56:36 +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: 22448402-579e-4b6d-85ba-ea832e9e52bf X-Archives-Hash: f0453852e412ac8e5c36cc85b313b3db commit: d33ffb6d7f392fffac72589ae99580f97a847eff Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 16 19:46:41 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Oct 16 19:53:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33ffb6d sys-fs/lvm2: rework install logic This makes the logic more readable. It also probably resolves a race condition by not passing both "install" and "install_device-mapper" as targets. Drop the "install_systemd_generators" target: this has been a noop for several releases. Closes: https://bugs.gentoo.org/913231 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/lvm2/lvm2-2.03.22-r1.ebuild | 22 +++++++++++----------- sys-fs/lvm2/lvm2-2.03.22-r2.ebuild | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild index 263e01250962..6d98d1035b43 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild @@ -194,17 +194,17 @@ src_test() { } src_install() { - local INSTALL_TARGETS=( - # full LVM2 - $(usev lvm "install install_tmpfiles_configuration") - # install systemd related files only when requested, bug #522430 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) \ - install_systemd_units install_systemd_generators") - - # install dm unconditionally - install_device-mapper - ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" + local targets=() + if use lvm; then + targets+=( install install_tmpfiles_configuration ) + if use systemd; then + # install systemd related files only when requested, bug #522430 + targets+=( install_systemd_units ) + fi + else + targets+=( install_device-mapper ) + fi + emake V=1 DESTDIR="${D}" "${targets[@]}" newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper diff --git a/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild index cac7188abf10..ba546b95e777 100644 --- a/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild @@ -194,17 +194,17 @@ src_test() { } src_install() { - local INSTALL_TARGETS=( - # full LVM2 - $(usev lvm "install install_tmpfiles_configuration") - # install systemd related files only when requested, bug #522430 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) \ - install_systemd_units install_systemd_generators") - - # install dm unconditionally - install_device-mapper - ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" + local targets=() + if use lvm; then + targets+=( install install_tmpfiles_configuration ) + if use systemd; then + # install systemd related files only when requested, bug #522430 + targets+=( install_systemd_units ) + fi + else + targets+=( install_device-mapper ) + fi + emake V=1 DESTDIR="${D}" "${targets[@]}" newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper