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 8A9C315808E for ; Sun, 24 Apr 2022 15:15:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A503E0823; Sun, 24 Apr 2022 15:15:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01112E0823 for ; Sun, 24 Apr 2022 15:14:59 +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 DB16634148D for ; Sun, 24 Apr 2022 15:14:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 112C5105 for ; Sun, 24 Apr 2022 15:14:53 +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: <1650813268.29f1e814f6c781e3809710b8b9a75024639ec0bf.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.02.188-r2.ebuild sys-fs/lvm2/lvm2-2.03.14-r1.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 29f1e814f6c781e3809710b8b9a75024639ec0bf X-VCS-Branch: master Date: Sun, 24 Apr 2022 15:14:53 +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: 43b0aa1a-48f5-49e8-ae71-31e22205dbf5 X-Archives-Hash: 52dace6c753d463927d881cc65fb238e commit: 29f1e814f6c781e3809710b8b9a75024639ec0bf Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 24 15:12:03 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 24 15:14:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f1e814 sys-fs/lvm2: pass systemdutildir to make install configure always calls pkg-config, and offers no way to override this variable. We need to call pkg-config with PKG_CONFIG_FDO_SYSROOT_RULES set to avoid duplicating SYSROOT in the install paths. systemd_get_utildir takes care of that for us. Closes: https://bugs.gentoo.org/840577 Signed-off-by: Mike Gilbert gentoo.org> sys-fs/lvm2/lvm2-2.02.188-r2.ebuild | 12 +++++------- sys-fs/lvm2/lvm2-2.03.14-r1.ebuild | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild index 60cc0d980580..a3e76755f1d5 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -207,14 +207,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild index 2ea2eaea55a6..47a08cc12e78 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild @@ -206,14 +206,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper