summaryrefslogtreecommitdiff
path: root/sys-fs/lvm2
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-11-18 03:03:03 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-11-18 03:03:03 +0000
commitf9f6fa91738181ebe9aca71b75d157d8b5df5335 (patch)
tree556cf671790196d83709b89133064a855f1879f2 /sys-fs/lvm2
parent3455c0a5153ae27d7c6c16ecd35fa3dec33f3dda (diff)
gentoo auto-resync : 18:11:2024 - 03:03:03
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r--sys-fs/lvm2/Manifest3
-rw-r--r--sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch137
-rw-r--r--sys-fs/lvm2/lvm2-2.03.22-r6.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.22-r5.ebuild)15
3 files changed, 151 insertions, 4 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cf9fa721ca32..148e8dc22b05 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -10,6 +10,7 @@ AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e045839
AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef
AUX lvm2-2.03.20-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557
AUX lvm2-2.03.22-autoconf-2.72-egrep.patch 841 BLAKE2B 89f2e2766fc915091292d4e19e9ba6cdda424ff1a6d160faaf0a62fa7156ddcfd47b36ce34df5981eb91db28f5ae2755a0a67c73bce86962f455ad73289885c7 SHA512 8e8218c628e617896456caafa3f83d4a95e54bd1edd9f0e003b3f922bab2935e16d19f18b6f2514c7f7b70d3ad54787669cd3e8b9770d2f1d0a8963c759b6520
+AUX lvm2-2.03.22-thin-autodetect.patch 6106 BLAKE2B 0707e8bcacf33a88eac8c77cad75d96b90988ccb39966f673a115b09fb025e89e62b472b5e5c8257e5d30938584c1df3bdd113cec890a05006e031240209b515 SHA512 ea2874a544ac104219e34e00f016b201f1dc27f632c9d83d6780c4a5d1461924929fde92469e7d40a23f727cc1b024a039f61d30a41b7b465e3f813d3620d643
AUX lvm2-2.03.22-thin-version-checking.patch 2619 BLAKE2B ce32b0b0dd8d7036784b100d4b7daf7eeffb2aa94db22a1bb4a7f809c77eab3baa33d1ea114be0aed0071349fc8299ec1330213da9639e262ace536b8849e966 SHA512 f5a93f85b4be3d133c30163acab90000190c50b1070619d308eb31ace8136145053e9020964459f779d4dc1b3bf9f3bcc61f74d00c5ce176b9cd695bd048025c
AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
@@ -17,5 +18,5 @@ DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286
DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff
EBUILD lvm2-2.03.21-r1.ebuild 8612 BLAKE2B a5adec8263b994e58610e51c17ecef378d0da54c5f9ee83de959c7d53e67850afc8b74297f342915d4ccc6138f35630e7b4c832e0d7d198f0a040c052b4f9157 SHA512 b589a726b5dfe66bf2861e48ece483d774a86d373ee58859b393114c719a9511c418d5fd24204ab1674e4ae88f393bf342ee6e83f282f1356f35a192693d8ed7
EBUILD lvm2-2.03.22-r1.ebuild 8572 BLAKE2B b03926843eb2baaed25fcf7b4f607163b18a2a8bfac59a2707b09d80ac49704ea737e40c9d083905b7fb02bad2de35aee853eee9c3423fb5d0fa7a6f6c052ba5 SHA512 993ad760ff582b8776c92f910c0eab3f015460240ec5ee77af743a4c9741c572ec2540af286287fc252b52c0f2950e5433af51d3e1ae616c3445c0a10464f7d4
-EBUILD lvm2-2.03.22-r5.ebuild 8655 BLAKE2B 0fcaa6d47dfb7eac0ba23f4b9afff97f1326c250697ba77077d9c9968be09da81684690ff26ffd8edb0f58a7f50c709c4d1898533b0e00d0fbe5235f34c9dd9d SHA512 acb9e341826506b3331bc06aa39eee05792baf0ffc2c5ba917f3ed65cd2162f42b1ddba44e95cf1e8af5df21635849f90aaeee1864b7ed29540e7227240403e5
+EBUILD lvm2-2.03.22-r6.ebuild 8811 BLAKE2B 6a05d6b0dbb51df6e7315334faf79bf996a46daad58da2c129ea53ce011b4cc692dc19628ffec2eda24467dc8048ff61591b36b6db84ba653777427cfb892bbf SHA512 9be4e8ea36e3147547e8b50638baca2d66ada91bb739ce7e4cd99338c0c0b6e918d8d8548d090d1133a95a4da6b70ff9c19186c48ddc700fa51cb4fd6bfbfe97
MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623
diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch b/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch
new file mode 100644
index 000000000000..968601af5b38
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch
@@ -0,0 +1,137 @@
+https://gitlab.com/lvmteam/lvm2/-/merge_requests/18
+
+From 25f0398b1c9d108160a39de43af6f2fa3f952db5 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 17 Nov 2024 10:45:29 -0500
+Subject: [PATCH] configure: update thin_check_needs_check logic
+
+If the user has explicitly passed a value for thin_check_needs_check,
+skip the autodetection logic entirely. Same for cache_check_needs_check.
+
+This allows lvm2 to be built consistently without having
+thin-provisioning-tools installed.
+---
+ configure.ac | 84 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 46 insertions(+), 38 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cbea6adc6..4f77b4e6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -422,7 +422,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")
+
+ # Test if necessary thin tools are available
+ # if not - use plain defaults and warn user
+@@ -437,20 +437,24 @@ AS_CASE(["$THIN"],
+ THIN_CONFIGURE_WARN="y"
+ ])
+ ])
+- AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && 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}')
+- THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
+-
+- AS_IF([test -z "$THIN_CHECK_VSN_MAJOR" || test -z "$THIN_CHECK_VSN_MINOR"], [
+- AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found])
+- THIN_CHECK_VERSION_WARN="y"
+- THIN_CHECK_NEEDS_CHECK="no"
+- ], [test "$THIN_CHECK_VSN_MAJOR" -eq 0 && test "$THIN_CHECK_VSN_MINOR" -lt 3], [
+- AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
+- THIN_CHECK_VERSION_WARN="y"
+- THIN_CHECK_NEEDS_CHECK="no"
++ AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "autodetect"], [
++ AS_IF([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}')
++ THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
++
++ AS_IF([test -z "$THIN_CHECK_VSN_MAJOR" || test -z "$THIN_CHECK_VSN_MINOR"], [
++ AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found])
++ THIN_CHECK_VERSION_WARN="y"
++ THIN_CHECK_NEEDS_CHECK="no"
++ ], [test "$THIN_CHECK_VSN_MAJOR" -eq 0 && test "$THIN_CHECK_VSN_MINOR" -lt 3], [
++ AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
++ THIN_CHECK_VERSION_WARN="y"
++ THIN_CHECK_NEEDS_CHECK="no"
++ ], [
++ THIN_CHECK_NEEDS_CHECK="yes"
++ ])
+ ])
+ ])
+ # Empty means a config way to ignore thin dumping
+@@ -535,7 +539,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")
+
+ # Test if necessary cache tools are available
+ # if not - use plain defaults and warn user
+@@ -550,30 +554,34 @@ AS_CASE(["$CACHE"],
+ CACHE_CONFIGURE_WARN="y"
+ ])
+ ])
+- AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && 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
+- rm -f conftest.tmp
+-
+- # Require version >= 0.5.4 for --clear-needs-check-flag
+- CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* }
+- AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \
+- || test -z "$CACHE_CHECK_VSN_MINOR" \
+- || test -z "$CACHE_CHECK_VSN_PATCH"], [
+- AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
+- CACHE_CHECK_VERSION_WARN="y"
+- CACHE_CHECK_NEEDS_CHECK="no"
+- ], [test "$CACHE_CHECK_VSN_MAJOR" -eq 0], [
+- AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
+- || ( test "$CACHE_CHECK_VSN_MINOR" -eq 5 && test "$CACHE_CHECK_VSN_PATCH" -lt 4 )], [
+- AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
++ AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "autodetect"], [
++ AS_IF([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
++ rm -f conftest.tmp
++
++ # Require version >= 0.5.4 for --clear-needs-check-flag
++ CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* }
++ AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \
++ || test -z "$CACHE_CHECK_VSN_MINOR" \
++ || test -z "$CACHE_CHECK_VSN_PATCH"], [
++ AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
+ CACHE_CHECK_VERSION_WARN="y"
+ CACHE_CHECK_NEEDS_CHECK="no"
+- ])
+- AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 7], [
+- AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
+- CACHE_CHECK_VERSION_WARN=y
++ ], [test "$CACHE_CHECK_VSN_MAJOR" -eq 0], [
++ AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
++ || ( test "$CACHE_CHECK_VSN_MINOR" -eq 5 && test "$CACHE_CHECK_VSN_PATCH" -lt 4 )], [
++ AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
++ CACHE_CHECK_VERSION_WARN="y"
++ CACHE_CHECK_NEEDS_CHECK="no"
++ ])
++ AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 7], [
++ AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
++ CACHE_CHECK_VERSION_WARN=y
++ ])
++ ], [
++ CACHE_CHECK_NEEDS_CHECK="yes"
+ ])
+ ])
+ ])
+--
+2.47.0
+
diff --git a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild
index e0a1e2d36d8c..45abee82f525 100644
--- a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind"
REQUIRED_USE="
static? ( !systemd !udev )
@@ -38,8 +38,11 @@ DEPEND_COMMON="
RDEPEND="
${DEPEND_COMMON}
>=sys-apps/baselayout-2.2
+ lvm? ( virtual/tmpfiles )
+"
+
+PDEPEND="
lvm? (
- virtual/tmpfiles
thin? ( >=sys-block/thin-provisioning-tools-1.0.6 )
)
"
@@ -70,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
"${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch
+ "${FILESDIR}"/${PN}-2.03.22-thin-autodetect.patch
)
pkg_setup() {
@@ -133,7 +137,12 @@ src_configure() {
)
if use lvm && use thin; then
- myeconfargs+=( --with-thin=internal --with-cache=internal )
+ myeconfargs+=(
+ --with-thin=internal
+ --enable-thin_check_needs_check
+ --with-cache=internal
+ --enable-cache_check_needs_check
+ )
local texec
for texec in check dump repair restore; do
myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} )
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 11:53:15 +0000