X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=lvm2-thin.patch;h=ea210e67aed6e55f54b6c2bf01fa42a555dcd965;hp=3b5616728328b0fe4ae4d2be617f6e3e493b23ef;hb=refs%2Fheads%2Fmaster;hpb=765e2390d61eeaa5f65ee8ad304d74292d57acd8 diff --git a/lvm2-thin.patch b/lvm2-thin.patch index 3b56167..ea210e6 100644 --- a/lvm2-thin.patch +++ b/lvm2-thin.patch @@ -1,48 +1,48 @@ -diff -ur LVM2.2.03.02.orig/configure.ac LVM2.2.03.02/configure.ac ---- LVM2.2.03.02.orig/configure.ac 2019-03-22 17:10:13.162000000 +0100 -+++ LVM2.2.03.02/configure.ac 2019-03-22 17:10:38.684000000 +0100 -@@ -411,7 +411,7 @@ +diff -urNpa LVM2.2.03.23.orig/configure.ac LVM2.2.03.23/configure.ac +--- LVM2.2.03.23.orig/configure.ac 2023-12-03 19:58:43.179205581 +0100 ++++ LVM2.2.03.23/configure.ac 2023-12-03 19:59:54.935057131 +0100 +@@ -409,7 +409,7 @@ dnl -- thin_check needs-check flag AC_ARG_ENABLE(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) +- 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 -@@ -426,7 +426,7 @@ - THIN_CONFIGURE_WARN=y - fi - fi -- 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}'` -@@ -439,6 +439,8 @@ +@@ -424,7 +424,7 @@ AS_CASE(["$THIN"], + THIN_CONFIGURE_WARN="y" + ]) + ]) +- AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [ ++ AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "autodetect" && test "$THIN_CONFIGURE_WARN" != "y"], [ + THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null) + THIN_CHECK_VSN=${THIN_CHECK_VSN##* } # trim away all before the first space + THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}') +@@ -438,7 +438,7 @@ AS_CASE(["$THIN"], AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found]) - THIN_CHECK_VERSION_WARN=y - THIN_CHECK_NEEDS_CHECK=no -+ else -+ THIN_CHECK_NEEDS_CHECK=yes - fi - fi + THIN_CHECK_VERSION_WARN="y" + THIN_CHECK_NEEDS_CHECK="no" +- ]) ++ ], [ THIN_CHECK_NEEDS_CHECK="yes" ]) + ]) # Empty means a config way to ignore thin dumping -@@ -524,7 +526,7 @@ + AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [ +@@ -522,7 +522,7 @@ dnl -- cache_check needs-check flag AC_ARG_ENABLE(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) +- 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 -@@ -563,6 +565,8 @@ +@@ -562,7 +562,7 @@ AS_CASE(["$CACHE"], AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2]) CACHE_CHECK_VERSION_WARN=y - fi -+ else -+ CACHE_CHECK_NEEDS_CHECK=yes - fi - fi + ]) +- ]) ++ ], [ CACHE_CHECK_NEEDS_CHECK="yes" ]) + ]) # Empty means a config way to ignore cache dumping + AS_IF([test "$CACHE_DUMP_CMD" = "autodetect"], [