commit 05cec2e8f2a517c8ff72a4433ac5e88b0b78c2b7
Author: Jakub Bogusz <[email protected]>
Date: Mon Feb 7 22:54:20 2022 +0100
- updated to 2.03.15; service based activation has been removed
- updated thin patch
- removed outdated paths patch
lvm2-thin.patch | 31 +++++++++++--------------------
lvm2.spec | 19 ++++++++-----------
paths.patch | 11 -----------
3 files changed, 19 insertions(+), 42 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index fa39f90..3628e9e 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -27,17 +27,16 @@
Summary: The new version of Logical Volume Manager for Linux
Summary(pl.UTF-8): Nowa wersja Logical Volume Managera dla Linuksa
Name: lvm2
-Version: 2.03.13
+Version: 2.03.15
Release: 1
License: GPL v2 and LGPL v2.1
Group: Applications/System
Source0: ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: c4be18fcb94c84c26f71ff4235917c28
+# Source0-md5: 0dbe745e945461419b56c7a21d7e47e2
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
@@ -299,7 +298,6 @@ potrzeby initrd.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{__aclocal}
@@ -416,6 +414,7 @@ install -d
$RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/lvm,/etc/sysconfig,/var/lock/
%{__make} install install_system_dirs install_systemd_units
install_systemd_generators install_initscripts install_tmpfiles_configuration \
DESTDIR=$RPM_BUILD_ROOT \
+ PYTHON_PREFIX=%{_prefix} \
OWNER="" \
GROUP=""
@@ -513,6 +512,7 @@ fi
%attr(755,root,root) %{_sbindir}/lvdisplay
%attr(755,root,root) %{_sbindir}/lvextend
%attr(755,root,root) %{_sbindir}/lvm
+%attr(755,root,root) %{_sbindir}/lvm_import_vdo
%attr(755,root,root) %{_sbindir}/lvmconfig
%attr(755,root,root) %{_sbindir}/lvmdevices
%attr(755,root,root) %{_sbindir}/lvmdiskscan
@@ -555,11 +555,13 @@ fi
%attr(755,root,root) %{_sbindir}/vgscan
%attr(755,root,root) %{_sbindir}/vgsplit
%{_mandir}/man5/lvm.conf.5*
+%{_mandir}/man7/lvmautoactivation.7*
%{_mandir}/man7/lvmcache.7*
%{_mandir}/man7/lvmraid.7*
%{_mandir}/man7/lvmreport.7*
%{_mandir}/man7/lvmsystemid.7*
%{_mandir}/man7/lvmthin.7*
+%{_mandir}/man7/lvmvdo.7*
%{_mandir}/man8/blkdeactivate.8*
%{_mandir}/man8/fsadm.8*
%{_mandir}/man8/lvchange.8*
@@ -567,12 +569,12 @@ fi
%{_mandir}/man8/lvcreate.8*
%{_mandir}/man8/lvdisplay.8*
%{_mandir}/man8/lvextend.8*
-%{_mandir}/man8/lvm2-activation-generator.8*
%{_mandir}/man8/lvm-config.8*
%{_mandir}/man8/lvm-dumpconfig.8*
%{_mandir}/man8/lvm-fullreport.8*
%{_mandir}/man8/lvm-lvpoll.8*
%{_mandir}/man8/lvm.8*
+%{_mandir}/man8/lvm_import_vdo.8*
%{_mandir}/man8/lvmconfig.8*
%{_mandir}/man8/lvmdevices.8*
%{_mandir}/man8/lvmdiskscan.8*
@@ -628,8 +630,6 @@ fi
%{systemdtmpfilesdir}/lvm2.conf
%{systemdunitdir}/blk-availability.service
%{systemdunitdir}/lvm2-monitor.service
-%{systemdunitdir}/[email protected]
-%attr(755,root,root) /lib/systemd/system-generators/lvm2-activation-generator
%dir %{_sysconfdir}/lvm/cache
%ghost %{_sysconfdir}/lvm/cache/.cache
%attr(754,root,root) /etc/rc.d/init.d/blk-availability
@@ -687,13 +687,12 @@ fi
/lib/udev/rules.d/10-dm.rules
/lib/udev/rules.d/11-dm-lvm.rules
/lib/udev/rules.d/13-dm-disk.rules
+/lib/udev/rules.d/69-dm-lvm.rules
/lib/udev/rules.d/95-dm-notify.rules
-/lib/udev/rules.d/69-dm-lvm-metad.rules
%attr(755,root,root) %{_sbindir}/dmeventd
%attr(755,root,root) %{_sbindir}/dmfilemapd
%attr(755,root,root) %{_sbindir}/dmsetup
%attr(755,root,root) %{_sbindir}/dmstats
-%attr(755,root,root) %{_sbindir}/vdoimport
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2mirror.so
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2raid.so
%attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2snapshot.so
@@ -705,12 +704,10 @@ fi
%attr(755,root,root)
%{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
%attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so
-%{_mandir}/man7/lvmvdo.7*
%{_mandir}/man8/dmfilemapd.8*
%{_mandir}/man8/dmsetup.8*
%{_mandir}/man8/dmstats.8*
%{_mandir}/man8/dmeventd.8*
-%{_mandir}/man8/vdoimport.8*
%files -n device-mapper-libs
%defattr(644,root,root,755)
diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index 6864b77..0c1cf6a 100644
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,24 +1,24 @@
---- LVM2.2.02.181/configure.ac.orig 2018-09-07 21:39:53.148246839 +0200
-+++ LVM2.2.02.181/configure.ac 2018-09-07 21:40:01.548246741 +0200
-@@ -397,7 +397,7 @@
+--- LVM2.2.03.15/configure.ac.orig 2022-02-07 18:07:31.000000000 +0100
++++ LVM2.2.03.15/configure.ac 2022-02-07 21:44:31.076301251 +0100
+@@ -411,7 +411,7 @@ dnl -- thin_check needs-check flag
AC_ARG_ENABLE(thin_check_needs_check,
- AC_HELP_STRING([--disable-thin_check_needs_check],
+ AS_HELP_STRING([--disable-thin_check_needs_check],
[required if thin_check version is < 0.3.0]),
- THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes)
+ THIN_CHECK_NEEDS_CHECK=$enableval,
THIN_CHECK_NEEDS_CHECK=autodetect)
# Test if necessary thin tools are available
# if not - use plain defaults and warn user
-@@ -412,7 +412,7 @@
+@@ -426,7 +426,7 @@ case "$THIN" in
THIN_CONFIGURE_WARN=y
fi
fi
-- if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
-+ if test "$THIN_CHECK_NEEDS_CHECK" = autodetect; then
+- if test "$THIN_CHECK_NEEDS_CHECK" = yes && test "$THIN_CONFIGURE_WARN"
!= y ; then
++ if test "$THIN_CHECK_NEEDS_CHECK" = autodetect && test
"$THIN_CONFIGURE_WARN" != y ; then
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.'
'{print $1}'`
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.'
'{print $2}'`
-@@ -425,6 +425,8 @@
+@@ -439,6 +439,8 @@ case "$THIN" in
AC_MSG_WARN([$THIN_CHECK_CMD: Old version
"$THIN_CHECK_VSN" found])
THIN_CHECK_VERSION_WARN=y
THIN_CHECK_NEEDS_CHECK=no
@@ -27,25 +27,16 @@
fi
fi
# Empty means a config way to ignore thin dumping
-@@ -511,7 +513,7 @@
+@@ -524,7 +526,7 @@ dnl -- cache_check needs-check flag
AC_ARG_ENABLE(cache_check_needs_check,
- AC_HELP_STRING([--disable-cache_check_needs_check],
+ AS_HELP_STRING([--disable-cache_check_needs_check],
[required if cache_check version is < 0.5]),
- CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK=yes)
+ CACHE_CHECK_NEEDS_CHECK=$enableval,
CACHE_CHECK_NEEDS_CHECK=autodetect)
# Test if necessary cache tools are available
# if not - use plain defaults and warn user
-@@ -526,7 +528,7 @@
- CACHE_CONFIGURE_WARN=y
- fi
- fi
-- if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
-+ if test "$CACHE_CHECK_NEEDS_CHECK" = autodetect; then
- $CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
- read -r CACHE_CHECK_VSN < conftest.tmp
- IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR
CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
-@@ -550,6 +552,8 @@
+@@ -563,6 +565,8 @@ case "$CACHE" in
AC_MSG_WARN([$CACHE_CHECK_CMD: Old version
"$CACHE_CHECK_VSN" does not support new cache format V2])
CACHE_CHECK_VERSION_WARN=y
fi
diff --git a/paths.patch b/paths.patch
deleted file mode 100644
index e4cd28f..0000000
--- a/paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/05cec2e8f2a517c8ff72a4433ac5e88b0b78c2b7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
