Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/
Date: Fri, 24 Jun 2022 16:25:08
Message-Id: 1656087828.eb8a99321f0bef37ad1b9a39876b61c9dec33150.floppym@gentoo
1 commit: eb8a99321f0bef37ad1b9a39876b61c9dec33150
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 24 16:23:48 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 24 16:23:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8a9932
7
8 sys-fs/lvm2: pass SYSTEMD_GENERATOR_DIR to make install
9
10 Passing systemdutildir does not work because it is a configure variable,
11 not a make variable.
12
13 Closes: https://bugs.gentoo.org/840577
14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
15
16 sys-fs/lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 2 +-
17 sys-fs/lvm2/{lvm2-2.03.14-r1.ebuild => lvm2-2.03.14-r2.ebuild} | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
21 similarity index 98%
22 rename from sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
23 rename to sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
24 index a3e76755f1d5..50111c5fabb3 100644
25 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
26 +++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
27 @@ -210,7 +210,7 @@ src_install() {
28 local inst
29 local INSTALL_TARGETS=( install install_tmpfiles_configuration )
30 # install systemd related files only when requested, bug #522430
31 - use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators )
32 + use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
33 use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
34 emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
35
36
37 diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
38 similarity index 98%
39 rename from sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
40 rename to sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
41 index 66b2184868ed..2da81764efe4 100644
42 --- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
43 +++ b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
44 @@ -212,7 +212,7 @@ src_install() {
45 local inst
46 local INSTALL_TARGETS=( install install_tmpfiles_configuration )
47 # install systemd related files only when requested, bug #522430
48 - use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators )
49 + use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
50 use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
51 emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"