63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From f358c8ba53970154054bc2140fb4127a116d97ff Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f358c8ba53970154054bc2140fb4127a116d97ff.1627492452.git.stefan@agner.ch>
|
|
In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch>
|
|
References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch>
|
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
Date: Fri, 21 May 2021 16:44:36 +0200
|
|
Subject: [PATCH 09/11] package/lvm2: fix installation of systemd units
|
|
|
|
Since we bump the version in commit 80997acd3587 (package/lvm2: bump
|
|
version to 2.03.12), the installation of systemd units is no longer
|
|
functional without a full installation.
|
|
|
|
As Pascal puts it: the systemd service files don't make a whole lot of
|
|
sense when there isn't a full lvm2 install.
|
|
|
|
Move the conditional block that install system units, so that it only
|
|
occurs when we do a full installation.
|
|
|
|
Fixes;
|
|
http://autobuild.buildroot.org/results/f47/f470ffb55625e2639cecde713442550eb532d0d7/
|
|
http://autobuild.buildroot.org/results/954/9547929292e81671fbe3a5b4bbc87a6424edb1ca/
|
|
http://autobuild.buildroot.org/results/303/30359c351a6ce2f9139494a531e036f0b0406ccf
|
|
|
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
Co-Developped-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
|
|
Cc: Pascal de Bruijn <p.debruijn@unilogic.nl>
|
|
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
|
(cherry picked from commit 8a313b019c7d7e898186a8b08f9c25ae0194fa16)
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
package/lvm2/lvm2.mk | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
|
|
index 19e8757e54..87c1c761ea 100644
|
|
--- a/package/lvm2/lvm2.mk
|
|
+++ b/package/lvm2/lvm2.mk
|
|
@@ -53,6 +53,9 @@ LVM2_INSTALL_TARGET_OPTS += install_device-mapper
|
|
else
|
|
LVM2_INSTALL_STAGING_OPTS += install
|
|
LVM2_INSTALL_TARGET_OPTS += install
|
|
+ifeq ($(BR2_INIT_SYSTEMD),y)
|
|
+LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
|
|
+endif
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
|
|
@@ -67,10 +70,6 @@ else
|
|
LVM2_CONF_OPTS += --disable-lvmetad
|
|
endif
|
|
|
|
-ifeq ($(BR2_INIT_SYSTEMD),y)
|
|
-LVM2_INSTALL_TARGET_OPTS += install_systemd_units install_systemd_generators
|
|
-endif
|
|
-
|
|
ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
|
|
LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
|
|
endif
|
|
--
|
|
2.32.0
|
|
|