Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2017-07-08 12:26:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Sat Jul 8 12:26:34 2017 rev:106 rq:508665 version:2.02.172 Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2017-07-04 11:55:53.246536310 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2017-07-08 12:26:36.680366148 +0200 @@ -2 +2,7 @@ -Thu Jun 29 16:38:05 UTC 2017 - dimstar@opensuse.org +Thu Jul 6 10:18:09 UTC 2017 - zren@suse.com + +- Don't create symlink for invisible device like thin-pool (bsc#1046591) + * drop 10-dm.rules-Reset-state-variable-for-spurious-events.patch + +------------------------------------------------------------------- +Tue Jul 4 10:24:40 UTC 2017 - zren@suse.com @@ -4,6 +10,9 @@ -- Add Special migration for libdevmapper's move from /lib to - /usr/lib and from device-mapper.rpm to libdevmapper.rpm: the - library is now in %{_libdir}, but up to the point where zypp - removes the 'old' device-mapper package, the old library 'wins' - the ldloader race resulting in binaries asking for the newer - version still getting the old one (boo#1045396). +- Update to LVM2.2.02.172 +- Cleanup spec file, and refresh patches + * removed device-mapper-link.patch + * removed bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch + * removed Makefile-skip-compliling-daemons-lvmlockd-directory.patch + * added bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch + +------------------------------------------------------------------- +Thu Jun 29 16:38:05 UTC 2017 - dimstar@opensuse.org @@ -11,12 +20 @@ - A typical update issue seen is, zypp updating packages in this - order: - - libdevmapper1_03 (new package) - - libcryptsetup4 (links libdevmapper-1.03, rpm dep satisfied) - - systemd (linking libcryptsetup.so.4, rpm dep satisfied - At this point, anything calling systemdctl gets libdevmapper - from the old device-mapper package into the memory, which in - turn is version 1.02 and does not provide all the needed - symbols - - device-mapper (which removes /lib/libdevmapper.so.1.02, but is - now too late, as various post scripts already failed on running - systemctl) +- Fix zypper update issue with device-mapper package, see bsc#1045396 lvm2-clvm.changes: same change lvm2.changes: same change Old: ---- 10-dm.rules-Reset-state-variable-for-spurious-events.patch LVM2.2.02.170.tgz LVM2.2.02.170.tgz.asc Makefile-skip-compliling-daemons-lvmlockd-directory.patch bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch device-mapper-link.patch New: ---- LVM2.2.02.172.tgz LVM2.2.02.172.tgz.asc bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.176155152 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.180154588 +0200 @@ -19,9 +19,9 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: device-mapper Version: %{device_mapper_version} @@ -47,7 +47,6 @@ %{?systemd_requires} ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -83,31 +82,21 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch - -# 3000+ for test code -#bnc#950089 -Patch3001: lvm2-testsuite.patch -#bsc#1043040 -Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch ### COMMON-PATCH-END ### %description @@ -116,7 +105,6 @@ %prep %setup -q -n LVM2.%{lvm2_version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -133,7 +121,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -142,9 +129,6 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### %build @@ -260,6 +244,7 @@ rm /%{_lib}/libdevmapper.so.1.03 fi /sbin/ldconfig + %postun -n %{libname} -p /sbin/ldconfig %package -n %{libname_event} ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.216149510 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.216149510 +0200 @@ -19,9 +19,9 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: lvm2-clvm Version: %{lvm2_version} @@ -50,7 +50,6 @@ Provides: cmirrord = %{version} ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -86,31 +85,21 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch - -# 3000+ for test code -#bnc#950089 -Patch3001: lvm2-testsuite.patch -#bsc#1043040 -Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch ### COMMON-PATCH-END ### %description @@ -120,7 +109,6 @@ %setup -q -n LVM2.%{lvm2_version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -137,7 +125,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -146,9 +133,6 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### %build @@ -165,8 +149,8 @@ --with-clvmd=corosync --with-cluster=internal --enable-cmirrord - --enable-lockd-dlm - --enable-lockd-sanlock + --enable-lvmlockd-dlm + --enable-lvmlockd-sanlock " ### COMMON-CONFIG-BEGIN ### ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.hDNASg/_old 2017-07-08 12:26:38.244145562 +0200 +++ /var/tmp/diff_new_pack.hDNASg/_new 2017-07-08 12:26:38.244145562 +0200 @@ -19,11 +19,13 @@ %define _udevdir %(pkg-config --variable=udevdir udev) %define applib liblvm2app2_2 %define cmdlib liblvm2cmd2_02 + ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.170 -%define device_mapper_version 1.02.139 -%define thin_provisioning_version 0.5.6 +%define lvm2_version 2.02.172 +%define device_mapper_version 1.02.141 +%define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### + Name: lvm2 Version: %{lvm2_version} Release: 0 @@ -53,9 +55,9 @@ Provides: lvm = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} + ### COMMON-PATCH-BEGIN ### # Upstream patches -Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch # SUSE patches: 1000+ for LVM # Never upstream @@ -91,35 +93,31 @@ #SUSE patches 2000+ for device mapper, udev rules #bsc#479104,bnc#707253 -Patch2000: device-mapper-dmsetup-export.patch -# no reference -Patch2001: device-mapper-gcc-warnings.patch -#bsc#724578 -Patch2002: device-mapper-link.patch +Patch2001: device-mapper-dmsetup-export.patch #bnc#78902,bnc#789019,bnc#789020 -Patch2003: udev_rules-update.diff +Patch2002: udev_rules-update.diff #bnc#875233 -Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch +Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch #bnc909358 -Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch -#bsc#932300 -Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch +Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch #bsc#940298 -Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch +Patch2005: libdm-iface-not-output-error-message-inside-retry-loop.patch #bnc#990538,bnc#986734 -Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch +Patch2006: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch #bsc#1012973 -Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2007: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +# no reference +Patch2008: device-mapper-gcc-warnings.patch +### COMMON-PATCH-END ### # 3000+ for test code #bnc#950089 Patch3001: lvm2-testsuite.patch #bsc#1043040 Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch -### COMMON-PATCH-END ### #bsc#1037309 -Patch4001: Makefile-skip-compliling-daemons-lvmlockd-directory.patch +Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch %description Programs and man pages for configuring and using the LVM2 Logical @@ -128,7 +126,6 @@ %prep %setup -q -n LVM2.%{version} ### COMMON-PREP-BEGIN ### -%patch0001 -p1 %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 @@ -145,7 +142,6 @@ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 -%patch2000 -p1 %patch2001 -p1 %patch2002 -p1 %patch2003 -p1 @@ -154,11 +150,10 @@ %patch2006 -p1 %patch2007 -p1 %patch2008 -p1 -%patch2009 -p1 -%patch3001 -p1 -%patch3002 -p1 ### COMMON-PREP-END ### +%patch3001 -p1 +%patch3002 -p1 %patch4001 -p1 %build @@ -233,25 +228,25 @@ rm %{buildroot}%{_sbindir}/dmsetup rm %{buildroot}%{_sbindir}/dmeventd rm %{buildroot}%{_sbindir}/dmstats -rm %{buildroot}%{_mandir}/man8/dmstats.8 -rm %{buildroot}%{_mandir}/man8/dmsetup.8 -rm %{buildroot}%{_mandir}/man8/dmeventd.8 rm %{buildroot}%{_udevrulesdir}/10-dm.rules rm %{buildroot}%{_udevrulesdir}/13-dm-disk.rules rm %{buildroot}%{_udevrulesdir}/95-dm-notify.rules rm %{buildroot}%{_unitdir}/dm-event.socket rm %{buildroot}%{_unitdir}/dm-event.service +# See bsc#1037309 for more info +rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service +rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service +rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_libdir}/libdevmapper.so.1.03 rm %{buildroot}%{_libdir}/libdevmapper-event.so.1.03 rm %{buildroot}%{_libdir}/libdevmapper.so rm %{buildroot}%{_libdir}/libdevmapper-event.so -rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc -# See bsc#1037309 for more info -rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service -rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service rm %{buildroot}%{_mandir}/man8/lvmlockctl.8 rm %{buildroot}%{_mandir}/man8/lvmlockd.8 +rm %{buildroot}%{_mandir}/man8/dmstats.8 +rm %{buildroot}%{_mandir}/man8/dmsetup.8 +rm %{buildroot}%{_mandir}/man8/dmeventd.8 # compat symlinks in /sbin remove with Leap 43 mkdir -p %{buildroot}/sbin ++++++ LVM2.2.02.170.tgz -> LVM2.2.02.172.tgz ++++++ ++++ 12513 lines of diff (skipped) ++++++ bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch ++++++
From c0d05011007bb46232e64435e05f6f6da212655b Mon Sep 17 00:00:00 2001 From: Eric Ren
Date: Tue, 4 Jul 2017 20:11:17 +0800 Subject: [PATCH] build: skip compliling daemons/lvmlockd directory
bsc#1037309
Signed-off-by: Eric Ren