From 6e7cf92f008a44518528e20b5e664557a336285f4484c23d74625dc215ad91ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Feb 2018 10:13:53 +0000 Subject: [PATCH] Accepting request 575513 from home:scarabeus_iv:branches:Base:System - Fix detection of clvm that happens on compile time based on CLVM_PIDFILE, as we determine these features on runtime: * bsc1080299-detect-clvm-properly.patch - Fix detection of clvm that happens on compile time based on CLVM_PIDFILE, as we determine these features on runtime: * bsc1080299-detect-clvm-properly.patch - Fix detection of clvm that happens on compile time based on CLVM_PIDFILE, as we determine these features on runtime: * bsc1080299-detect-clvm-properly.patch OBS-URL: https://build.opensuse.org/request/show/575513 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=218 --- bsc1080299-detect-clvm-properly.patch | 42 +++++++++++++++++++++++++++ device-mapper.changes | 7 +++++ device-mapper.spec | 2 ++ lvm2-clvm.changes | 7 +++++ lvm2-clvm.spec | 2 ++ lvm2.changes | 7 +++++ lvm2.spec | 2 ++ 7 files changed, 69 insertions(+) create mode 100644 bsc1080299-detect-clvm-properly.patch diff --git a/bsc1080299-detect-clvm-properly.patch b/bsc1080299-detect-clvm-properly.patch new file mode 100644 index 0000000..8766381 --- /dev/null +++ b/bsc1080299-detect-clvm-properly.patch @@ -0,0 +1,42 @@ +Index: LVM2.2.02.177/configure +=================================================================== +--- LVM2.2.02.177.orig/configure ++++ LVM2.2.02.177/configure +@@ -10888,8 +10888,6 @@ if [ `expr x"$CLVMD" : '.*corosync.*'` ! + fi + + ################################################################################ +-if test "$CLVMD" != none; then +- + # Check whether --with-clvmd-pidfile was given. + if test "${with_clvmd_pidfile+set}" = set; then : + withval=$with_clvmd_pidfile; CLVMD_PIDFILE=$withval +@@ -10902,8 +10900,6 @@ cat >>confdefs.h <<_ACEOF + #define CLVMD_PIDFILE "$CLVMD_PIDFILE" + _ACEOF + +-fi +- + ################################################################################ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build cluster mirror log daemon" >&5 + $as_echo_n "checking whether to build cluster mirror log daemon... " >&6; } +Index: LVM2.2.02.177/configure.in +=================================================================== +--- LVM2.2.02.177.orig/configure.in ++++ LVM2.2.02.177/configure.in +@@ -959,7 +959,6 @@ fi + + ################################################################################ + dnl -- clvmd pidfile +-if test "$CLVMD" != none; then + AC_ARG_WITH(clvmd-pidfile, + AC_HELP_STRING([--with-clvmd-pidfile=PATH], + [clvmd pidfile [PID_DIR/clvmd.pid]]), +@@ -967,7 +966,6 @@ if test "$CLVMD" != none; then + CLVMD_PIDFILE="$DEFAULT_PID_DIR/clvmd.pid") + AC_DEFINE_UNQUOTED(CLVMD_PIDFILE, ["$CLVMD_PIDFILE"], + [Path to clvmd pidfile.]) +-fi + + ################################################################################ + dnl -- Build cluster mirror log daemon diff --git a/device-mapper.changes b/device-mapper.changes index 5602550..55cf248 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 12 09:01:29 UTC 2018 - tchvatal@suse.com + +- Fix detection of clvm that happens on compile time based on + CLVM_PIDFILE, as we determine these features on runtime: + * bsc1080299-detect-clvm-properly.patch + ------------------------------------------------------------------- Tue Jan 16 11:53:36 UTC 2018 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 4bed89a..5d79d3e 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -55,6 +55,7 @@ Patch1001: cmirrord_remove_date_time_from_compilation.patch Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch +Patch1005: bsc1080299-detect-clvm-properly.patch #SUSE patches 2000+ for device mapper, udev rules Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch @@ -71,6 +72,7 @@ Programs and man pages for configuring and using the device mapper. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 +%patch1005 -p1 %patch2001 -p1 ### COMMON-PREP-END ### diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 5602550..55cf248 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 12 09:01:29 UTC 2018 - tchvatal@suse.com + +- Fix detection of clvm that happens on compile time based on + CLVM_PIDFILE, as we determine these features on runtime: + * bsc1080299-detect-clvm-properly.patch + ------------------------------------------------------------------- Tue Jan 16 11:53:36 UTC 2018 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 28ff537..a3f7db4 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -56,6 +56,7 @@ Patch1001: cmirrord_remove_date_time_from_compilation.patch Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch +Patch1005: bsc1080299-detect-clvm-properly.patch #SUSE patches 2000+ for device mapper, udev rules Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch @@ -76,6 +77,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 +%patch1005 -p1 %patch2001 -p1 ### COMMON-PREP-END ### diff --git a/lvm2.changes b/lvm2.changes index 5602550..55cf248 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 12 09:01:29 UTC 2018 - tchvatal@suse.com + +- Fix detection of clvm that happens on compile time based on + CLVM_PIDFILE, as we determine these features on runtime: + * bsc1080299-detect-clvm-properly.patch + ------------------------------------------------------------------- Tue Jan 16 11:53:36 UTC 2018 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index 8b29d17..7668175 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -66,6 +66,7 @@ Patch1001: cmirrord_remove_date_time_from_compilation.patch Patch1002: fate-309425_display-dm-name-for-lv-name.patch Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch +Patch1005: bsc1080299-detect-clvm-properly.patch #SUSE patches 2000+ for device mapper, udev rules Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch @@ -91,6 +92,7 @@ Volume Manager. %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 +%patch1005 -p1 %patch2001 -p1 ### COMMON-PREP-END ###