[packages/vdo/DEVEL-8] - updated to 8.3.1.1
qboosh
qboosh at pld-linux.org
Mon Mar 24 21:44:12 CET 2025
commit 44ff02d43fa452dd0d304fc001b681f326904102
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Mar 24 21:39:38 2025 +0100
- updated to 8.3.1.1
vdo-types.patch | 80 +++++++++++++++++++++++++++++++--------------------------
vdo-x86.patch | 54 +++++++++++++++++++-------------------
vdo.spec | 17 ++++--------
3 files changed, 76 insertions(+), 75 deletions(-)
---
diff --git a/vdo.spec b/vdo.spec
index ec82800..811e931 100644
--- a/vdo.spec
+++ b/vdo.spec
@@ -1,13 +1,13 @@
Summary: Management tools for Virtual Data Optimizer
Summary(pl.UTF-8): Narzędzia do zarządzania podsystemem Virtual Data Optimizer
Name: vdo
-Version: 8.2.2.2
+Version: 8.3.1.1
Release: 1
License: GPL v2
Group: Applications/System
#Source0Download: https://github.com/dm-vdo/vdo/releases
Source0: https://github.com/dm-vdo/vdo/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 36464435c234af7b92c3d02bd76e3d15
+# Source0-md5: 8b1e872be780ef530285710f9a25983f
Patch0: %{name}-x86.patch
Patch1: %{name}-types.patch
URL: http://github.com/dm-vdo/vdo
@@ -18,6 +18,7 @@ BuildRequires: python3 >= 1:3.6
BuildRequires: python3-devel >= 1:3.6
BuildRequires: python3-modules >= 1:3.6
BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: sed >= 4.0
BuildRequires: valgrind
BuildRequires: zlib-devel
@@ -114,26 +115,20 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc CONTRIBUTORS.txt README.md examples/monitor
-%attr(755,root,root) %{_bindir}/vdodmeventd
-%attr(755,root,root) %{_bindir}/vdodumpconfig
%attr(755,root,root) %{_bindir}/vdoforcerebuild
%attr(755,root,root) %{_bindir}/vdoformat
-%attr(755,root,root) %{_bindir}/vdosetuuid
%attr(755,root,root) %{_bindir}/vdostats
-%{_mandir}/man8/vdodmeventd.8*
-%{_mandir}/man8/vdodumpconfig.8*
%{_mandir}/man8/vdoforcerebuild.8*
%{_mandir}/man8/vdoformat.8*
-%{_mandir}/man8/vdosetuuid.8*
%{_mandir}/man8/vdostats.8*
%files -n bash-completion-vdo
%defattr(644,root,root,755)
-/etc/bash_completion.d/vdostats
+%{bash_compdir}/vdostats
%files support
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/adaptLVMVDO.sh
+%attr(755,root,root) %{_bindir}/adaptlvm
%attr(755,root,root) %{_bindir}/vdoaudit
%attr(755,root,root) %{_bindir}/vdodebugmetadata
%attr(755,root,root) %{_bindir}/vdodumpblockmap
@@ -141,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/vdolistmetadata
%attr(755,root,root) %{_bindir}/vdoreadonly
%attr(755,root,root) %{_bindir}/vdorecover
-%attr(755,root,root) %{_bindir}/vdoregenerategeometry
%{_mandir}/man8/adaptlvm.8*
%{_mandir}/man8/vdoaudit.8*
%{_mandir}/man8/vdodebugmetadata.8*
@@ -150,4 +144,3 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/vdolistmetadata.8*
%{_mandir}/man8/vdoreadonly.8*
%{_mandir}/man8/vdorecover.8*
-%{_mandir}/man8/vdoregenerategeometry.8*
diff --git a/vdo-types.patch b/vdo-types.patch
index c84eff6..91370f3 100644
--- a/vdo-types.patch
+++ b/vdo-types.patch
@@ -1,25 +1,24 @@
---- vdo-8.2.2.2/utils/uds/index-layout.c.orig 2023-06-20 23:21:16.000000000 +0200
-+++ vdo-8.2.2.2/utils/uds/index-layout.c 2023-09-18 18:22:26.458891054 +0200
-@@ -1990,9 +1990,9 @@ static int create_layout_factory(struct
- writable_size = get_uds_writable_size(factory) & -UDS_BLOCK_SIZE;
+--- vdo-8.3.1.1/utils/uds/index-layout.c.orig 2025-03-24 20:09:36.313475431 +0100
++++ vdo-8.3.1.1/utils/uds/index-layout.c 2025-03-24 20:11:07.179649833 +0100
+@@ -1676,8 +1676,8 @@ static int create_layout_factory(struct
+ writable_size = uds_get_writable_size(factory) & -UDS_BLOCK_SIZE;
if (writable_size < config->size + config->offset) {
- put_uds_io_factory(factory);
-- uds_log_error("index storage (%zu) is smaller than the requested size %zu",
-+ uds_log_error("index storage (%zu) is smaller than the requested size %"PRIu64,
- writable_size,
-- config->size + config->offset);
-+ (uint64_t)(config->size + config->offset));
+ uds_put_io_factory(factory);
+- vdo_log_error("index storage (%zu) is smaller than the requested size %zu",
+- writable_size, config->size + config->offset);
++ vdo_log_error("index storage (%zu) is smaller than the requested size %" PRIu64,
++ writable_size, (uint64_t)(config->size + config->offset));
return -ENOSPC;
}
---- vdo-8.2.2.2/utils/vdo/fileLayer.c.orig 2023-09-18 18:22:44.048795761 +0200
-+++ vdo-8.2.2.2/utils/vdo/fileLayer.c 2023-09-18 18:26:50.834125477 +0200
+--- vdo-8.3.1.1/utils/vdo/fileLayer.c.orig 2025-03-24 20:09:36.313475431 +0100
++++ vdo-8.3.1.1/utils/vdo/fileLayer.c 2025-03-24 20:12:11.632633994 +0100
@@ -138,10 +138,10 @@ static int performIO(FileLayer
if (n == 0) {
errno = VDO_UNEXPECTED_EOF;
}
-- return uds_log_error_strerror(errno, "p%s %s @%zd",
-+ return uds_log_error_strerror(errno, "p%s %s @%"PRId64,
+- return vdo_log_error_strerror(errno, "p%s %s @%zd",
++ return vdo_log_error_strerror(errno, "p%s %s @%" PRId64,
(read ? "read" : "write"),
layer->name,
- offset);
@@ -27,14 +26,14 @@
}
offset += n;
-@@ -359,8 +359,8 @@ static int setupFileLayer(const char
+@@ -354,8 +354,8 @@ static int setupFileLayer(const char
layer->blockCount = deviceBlocks;
} else if (layer->blockCount != deviceBlocks) {
- result = uds_log_error_strerror(VDO_PARAMETER_MISMATCH,
+ result = vdo_log_error_strerror(VDO_PARAMETER_MISMATCH,
- "physical size %ld 4k blocks must match"
- " physical size %ld 4k blocks of %s",
-+ "physical size %"PRId64" 4k blocks must match"
-+ " physical size %"PRId64" 4k blocks of %s",
++ "physical size %" PRId64 " 4k blocks must match"
++ " physical size %" PRId64 " 4k blocks of %s",
layer->blockCount, deviceBlocks,
layer->name);
try_close_file(layer->fd);
@@ -49,29 +48,18 @@
}
/**********************************************************************/
---- vdo-8.1.1.360/utils/vdo/vdoregenerategeometry.c.orig 2022-05-10 20:40:40.487838560 +0200
-+++ vdo-8.1.1.360/utils/vdo/vdoregenerategeometry.c 2022-05-10 20:40:43.144490835 +0200
-@@ -89,7 +89,7 @@ static Candidate candidates[UDS_CON
- static int candidateCount = 0;
-
- static char *fileName = NULL;
--static size_t offset = 0;
-+static uint64_t offset = 0;
-
- /**
- * Explain how this command-line tool is used.
---- vdo-8.1.1.360/utils/vdo/messageStatsReader.c.orig 2022-02-12 21:47:10.000000000 +0100
-+++ vdo-8.1.1.360/utils/vdo/messageStatsReader.c 2022-05-10 21:07:02.595934211 +0200
-@@ -37,7 +37,7 @@ static int skip_string(char **buf, char
- static int read_uint64_t(char **buf,
- uint64_t *value)
+--- vdo-8.3.1.1/utils/vdo/messageStatsReader.c.orig 2025-03-14 01:17:27.000000000 +0100
++++ vdo-8.3.1.1/utils/vdo/messageStatsReader.c 2025-03-24 20:13:32.682194911 +0100
+@@ -23,7 +23,7 @@ static int skip_string(char **buf, char
+ static int read_u64(char **buf,
+ u64 *value)
{
- int count = sscanf(*buf, "%lu, ", value);
-+ int count = sscanf(*buf, "%"PRIu64", ", value);
++ int count = sscanf(*buf, "%" PRIu64 ", ", value);
if (count != 1) {
return VDO_UNEXPECTED_EOF;
}
-@@ -59,7 +59,7 @@ static int read_uint32_t(char **buf,
+@@ -43,7 +43,7 @@ static int read_u32(char **buf,
static int read_block_count_t(char **buf,
block_count_t *value)
{
@@ -100,3 +88,23 @@
if (count < 0) {
return VDO_UNEXPECTED_EOF;
}
+--- vdo-8.3.1.1/utils/uds/dm-bufio.c.orig 2025-03-14 01:17:27.000000000 +0100
++++ vdo-8.3.1.1/utils/uds/dm-bufio.c 2025-03-24 21:26:41.018421254 +0100
+@@ -140,7 +140,7 @@ void *dm_bufio_read(struct dm_bufio_clie
+ data = dm_bufio_new(client, block, &buffer);
+ if (IS_ERR(data)) {
+ vdo_log_error_strerror(-PTR_ERR(data),
+- "error reading physical page %lu",
++ "error reading physical page %" PRIu64,
+ block);
+ return data;
+ }
+@@ -153,7 +153,7 @@ void *dm_bufio_read(struct dm_bufio_clie
+ if (result != UDS_SUCCESS) {
+ dm_bufio_release(buffer);
+ vdo_log_warning_strerror(result,
+- "error reading physical page %lu",
++ "error reading physical page %" PRIu64,
+ block);
+ return ERR_PTR(-EIO);
+ }
diff --git a/vdo-x86.patch b/vdo-x86.patch
index 6967ccc..8805d04 100644
--- a/vdo-x86.patch
+++ b/vdo-x86.patch
@@ -1,58 +1,58 @@
---- vdo-8.1.1.360/utils/uds/cpu.h.orig 2022-05-10 09:00:13.892182837 +0200
-+++ vdo-8.1.1.360/utils/uds/cpu.h 2022-05-10 20:17:03.618847732 +0200
-@@ -36,7 +36,7 @@
- #define CACHE_LINE_BYTES 128
- #elif defined(__s390x__)
- #define CACHE_LINE_BYTES 256
--#elif defined(__x86_64__) || defined(__aarch64__)
-+#elif defined(__x86_64__) || defined(__i386__) || defined(__aarch64__)
- #define CACHE_LINE_BYTES 64
- #else
- #error "unknown cache line size"
---- vdo-8.1.1.360/utils/uds/atomicDefs.h.orig 2022-02-12 21:47:10.000000000 +0100
-+++ vdo-8.1.1.360/utils/uds/atomicDefs.h 2022-05-10 20:17:51.798586720 +0200
-@@ -82,7 +82,7 @@ static INLINE void barrier(void)
+--- vdo-8.3.1.1/utils/uds/linux/atomic.h.orig 2025-03-14 01:17:27.000000000 +0100
++++ vdo-8.3.1.1/utils/uds/linux/atomic.h 2025-03-24 21:04:02.195782628 +0100
+@@ -79,7 +79,7 @@ static inline void barrier(void)
**/
- static INLINE void smp_mb(void)
+ static inline void smp_mb(void)
{
-#if defined __x86_64__
+#if defined __x86_64__ || defined __i386__
/*
* X86 full fence. Supposedly __sync_synchronize() will do this, but
* either the GCC documentation is a lie or GCC is broken.
-@@ -113,7 +113,7 @@ static INLINE void smp_mb(void)
+@@ -114,7 +114,7 @@ static inline void smp_mb(void)
**/
- static INLINE void smp_rmb(void)
+ static inline void smp_rmb(void)
{
-#if defined __x86_64__
+#if defined __x86_64__ || defined __i386__
- // XXX The implementation on x86 is more aggressive than necessary.
+ // The implementation on x86 is more aggressive than necessary.
__asm__ __volatile__("lfence" : : : "memory");
#elif defined __aarch64__
-@@ -138,7 +138,7 @@ static INLINE void smp_rmb(void)
+@@ -143,7 +143,7 @@ static inline void smp_rmb(void)
**/
- static INLINE void smp_wmb(void)
+ static inline void smp_wmb(void)
{
-#if defined __x86_64__
+#if defined __x86_64__ || defined __i386__
- // XXX The implementation on x86 is more aggressive than necessary.
+ // The implementation on x86 is more aggressive than necessary.
__asm__ __volatile__("sfence" : : : "memory");
#elif defined __aarch64__
-@@ -158,7 +158,7 @@ static INLINE void smp_wmb(void)
+@@ -167,7 +167,7 @@ static inline void smp_wmb(void)
**/
- static INLINE void smp_mb__before_atomic(void)
+ static inline void smp_mb__before_atomic(void)
{
-#if defined(__x86_64__) || defined(__s390__)
-+#if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
++#if defined(__x86_64__) || defined(__s390__) || defined __i386__
// Atomic operations are already serializing on x86 and s390
barrier();
#else
-@@ -172,7 +172,7 @@ static INLINE void smp_mb__before_atomic
+@@ -181,7 +181,7 @@ static inline void smp_mb__before_atomic
**/
- static INLINE void smp_mb__after_atomic(void)
+ static inline void smp_mb__after_atomic(void)
{
-#if defined(__x86_64__) || defined(__s390__)
-+#if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
++#if defined(__x86_64__) || defined(__s390__) || defined __i386__
// Atomic operations are already serializing on x86 and s390
barrier();
#else
+--- vdo-8.3.1.1/utils/uds/linux/cache.h.orig 2025-03-14 01:17:27.000000000 +0100
++++ vdo-8.3.1.1/utils/uds/linux/cache.h 2025-03-24 20:43:32.302445532 +0100
+@@ -15,7 +15,7 @@
+ #define L1_CACHE_BYTES 128
+ #elif defined(__s390x__)
+ #define L1_CACHE_BYTES 256
+-#elif defined(__x86_64__) || defined(__aarch64__) || defined(__riscv) || defined (__loongarch64)
++#elif defined(__x86_64__) || defined(__aarch64__) || defined(__riscv) || defined (__loongarch64) || defined(__i386__)
+ #define L1_CACHE_BYTES 64
+ #else
+ #error "unknown cache line size"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vdo.git/commitdiff/44ff02d43fa452dd0d304fc001b681f326904102
More information about the pld-cvs-commit
mailing list