X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lvm2-thin.patch;h=0f0cd216a9cc7bfff59b52475234de45f7f9f227;hb=959a818ea43c23dc2638b665d66f2ff2a6a6b5fe;hp=8c396027ebb84cadec0fa0c4ba420be774ddc9bd;hpb=eeebf03100069a2d93ac4199fb7e7be29e5d31b0;p=packages%2Flvm2.git diff --git a/lvm2-thin.patch b/lvm2-thin.patch index 8c39602..0f0cd21 100644 --- a/lvm2-thin.patch +++ b/lvm2-thin.patch @@ -1,57 +1,47 @@ -diff -urp LVM2.2.02.179.orig/configure.ac LVM2.2.02.179/configure.ac ---- LVM2.2.02.179.orig/configure.ac 2018-06-26 11:40:19.088840999 +0000 -+++ LVM2.2.02.179/configure.ac 2018-06-26 11:51:45.460800089 +0000 -@@ -397,7 +397,7 @@ dnl -- thin_check needs-check flag +--- LVM2.2.03.19/configure.ac.orig 2023-02-21 15:37:53.000000000 +0100 ++++ LVM2.2.03.19/configure.ac 2023-02-22 10:52:41.267893915 +0100 +@@ -393,7 +393,7 @@ 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) +- 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 @@ 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 - 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 @@ case "$THIN" in +@@ -421,7 +421,7 @@ 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 -@@ -511,7 +513,7 @@ dnl -- cache_check needs-check flag + AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [ +@@ -505,7 +505,7 @@ 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) +- 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 @@ case "$CACHE" in - CACHE_CONFIGURE_WARN=y - fi - fi -- if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then -+ if test "$CACHE_CHECK_NEEDS_CHECK" = autodetect; then +@@ -520,7 +520,7 @@ + CACHE_CONFIGURE_WARN="y" + ]) + ]) +- AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [ ++ AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "autodetect" && test "$CACHE_CONFIGURE_WARN" != "y"], [ $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 @@ case "$CACHE" in +@@ -544,7 +544,7 @@ 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"], [