[packages/lvm2] - fix some path, drop comment
arekm
arekm at pld-linux.org
Tue Dec 17 21:26:10 CET 2019
commit d3e9e60b57d057fb1c8bd82d8c50c5b61f149700
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Dec 17 21:25:55 2019 +0100
- fix some path, drop comment
lvm2.spec | 6 ++----
paths.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index 1abf68d..bdece44 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -46,6 +46,7 @@ Patch0: device-mapper-dmsetup-export.patch
Patch1: %{name}-pld_init.patch
Patch2: device-mapper-dmsetup-deps-export.patch
Patch3: %{name}-thin.patch
+Patch4: paths.patch
URL: http://www.sourceware.org/lvm2/
BuildRequires: autoconf >= 2.69
BuildRequires: automake
@@ -328,10 +329,7 @@ potrzeby initrd.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-
-# do not force --export-symbol linker option for e.g. statically linked executables
-# -rdynamic compiler option drives linker in the right way.
-#%{__sed} -i -e 's#-Wl,--export-dynamic#-rdynamic#g' configure.ac
+%patch4 -p1
%build
cp -f /usr/share/automake/config.sub autoconf
diff --git a/paths.patch b/paths.patch
new file mode 100644
index 0000000..e4cd28f
--- /dev/null
+++ b/paths.patch
@@ -0,0 +1,11 @@
+--- LVM2.2.03.07/scripts/lvm2_activation_generator_systemd_red_hat.c~ 2019-11-30 14:57:10.000000000 +0100
++++ LVM2.2.03.07/scripts/lvm2_activation_generator_systemd_red_hat.c 2019-12-17 21:15:23.770902038 +0100
+@@ -145,7 +145,7 @@ static int generate_unit(struct generato
+ fprintf(f, "After=%s iscsi.service fcoe.service rbdmap.service\n"
+ "Before=remote-fs-pre.target shutdown.target\n\n"
+ "[Service]\n"
+- "ExecStartPre=/usr/bin/udevadm settle\n", _unit_names[UNIT_MAIN]);
++ "ExecStartPre=/sbin/udevadm settle\n", _unit_names[UNIT_MAIN]);
+ } else {
+ if (unit == UNIT_EARLY)
+ fputs("After=systemd-udev-settle.service\n"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lvm2.git/commitdiff/d3e9e60b57d057fb1c8bd82d8c50c5b61f149700
More information about the pld-cvs-commit
mailing list