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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D181E158092 for ; Sun, 19 Sep 2021 21:37:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36979E0891; Sun, 19 Sep 2021 21:37:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C0EBE0891 for ; Sun, 19 Sep 2021 21:37:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E0983433AF for ; Sun, 19 Sep 2021 21:37:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4756CF for ; Sun, 19 Sep 2021 21:37:50 +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: <1632087385.9b09f0646011091f3a3af4259e12dfdafcfbceed.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.13-r2.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9b09f0646011091f3a3af4259e12dfdafcfbceed X-VCS-Branch: master Date: Sun, 19 Sep 2021 21:37:50 +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: 462e6f27-acde-49df-8aa8-da5cbc9f405f X-Archives-Hash: ccf4aed9d6a2f3bc82638ba354f56810 commit: 9b09f0646011091f3a3af4259e12dfdafcfbceed Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 19 21:35:46 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 19 21:36:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b09f064 sys-fs/lvm2: skip tmpfiles when USE=device-mapper-only Signed-off-by: Mike Gilbert gentoo.org> sys-fs/lvm2/lvm2-2.02.188-r2.ebuild | 6 +++++- sys-fs/lvm2/lvm2-2.03.13-r2.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild index a6c786adcc2..2ed5a5019a9 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +TMPFILES_OPTIONAL=1 inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" @@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON} !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) + !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} @@ -265,7 +267,9 @@ src_install() { } pkg_postinst() { - tmpfiles_process lvm2.conf + if ! use device-mapper-only; then + tmpfiles_process lvm2.conf + fi if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild index f6c64e6f5d1..416cccb8fd2 100644 --- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +TMPFILES_OPTIONAL=1 inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" @@ -36,6 +37,7 @@ RDEPEND="${DEPEND_COMMON} !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) + !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} @@ -253,7 +255,9 @@ src_install() { } pkg_postinst() { - tmpfiles_process lvm2.conf + if ! use device-mapper-only; then + tmpfiles_process lvm2.conf + fi if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation