packages/vdo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 Upgrade to 8.2.2.2

Browse Source 
From: @lyn1001 
Reviewed-by: @zhangwenlong01, @laokz, @starlet-dx 
Signed-off-by: @starlet-dx
This commit is contained in:
openeuler-ci-bot 2024-02-27 06:09:58 +00:00 committed by Gitee
commit cac00714cf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 42 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
0001-Add-loongarch64-support.patch
View File

@ -12,7 +12,7 @@ diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h
index 0aad609..f468369 100644 index 0aad609..f468369 100644
--- a/utils/uds/atomicDefs.h --- a/utils/uds/atomicDefs.h
+++ b/utils/uds/atomicDefs.h +++ b/utils/uds/atomicDefs.h
@@ -96,6 +96,8 @@ static INLINE void smp_mb(void) @@ -97,6 +97,8 @@
__asm__ __volatile__("bcr 14,0" : : : "memory"); __asm__ __volatile__("bcr 14,0" : : : "memory");
#elif defined __PPC__ #elif defined __PPC__
__asm__ __volatile__("sync" : : : "memory"); __asm__ __volatile__("sync" : : : "memory");
@ -21,7 +21,7 @@ index 0aad609..f468369 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -121,6 +123,8 @@ static INLINE void smp_rmb(void) @@ -122,6 +124,8 @@
__asm__ __volatile__("bcr 14,0" : : : "memory"); __asm__ __volatile__("bcr 14,0" : : : "memory");
#elif defined __PPC__ #elif defined __PPC__
__asm__ __volatile__("lwsync" : : : "memory"); __asm__ __volatile__("lwsync" : : : "memory");
@ -30,7 +30,7 @@ index 0aad609..f468369 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -146,6 +150,8 @@ static INLINE void smp_wmb(void) @@ -147,6 +151,8 @@
__asm__ __volatile__("bcr 14,0" : : : "memory"); __asm__ __volatile__("bcr 14,0" : : : "memory");
#elif defined __PPC__ #elif defined __PPC__
__asm__ __volatile__("lwsync" : : : "memory"); __asm__ __volatile__("lwsync" : : : "memory");
@ -39,15 +39,6 @@ index 0aad609..f468369 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -172,7 +178,7 @@ static INLINE void smp_mb__before_atomic(void)
static INLINE void smp_read_barrier_depends(void)
{
#if defined(__x86_64__) || defined(__PPC__) || defined(__s390__) \
- || defined(__aarch64__)
+ || defined(__aarch64__) || defined(__loongarch64)
// Nothing needed for these architectures.
#else
// Default to playing it safe.
diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h
index 6549f6e..e26d653 100644 index 6549f6e..e26d653 100644
--- a/utils/uds/cpu.h --- a/utils/uds/cpu.h
@ -58,9 +49,6 @@ index 6549f6e..e26d653 100644
#define CACHE_LINE_BYTES 256 #define CACHE_LINE_BYTES 256
-#elif defined(__x86_64__) || defined(__aarch64__) -#elif defined(__x86_64__) || defined(__aarch64__)
+#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) +#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64)
#define CACHE_LINE_BYTES 64 #define CACHE_LINE_BYTES 64
#else #else
#error "unknown cache line size" #error "unknown cache line size"
--
2.33.0

38
0002-Ignore-misaligned-pointers.patch
View File

@ -1,38 +0,0 @@
From a85f6e9973697f90d11e9beb1eb16206774e4767 Mon Sep 17 00:00:00 2001
From: "Christopher N. Hesse" <raymanfx@gmail.com>
Date: Wed, 3 Apr 2019 22:24:29 +0200
Subject: [PATCH 2/2] Ignore misaligned pointers
Signed-off-by: Christopher N. Hesse <raymanfx@gmail.com>
---
utils/vdo/base/Makefile | 1 +
utils/vdo/user/Makefile | 1 +
2 files changed, 2 insertions(+)
diff --git a/utils/vdo/base/Makefile b/utils/vdo/base/Makefile
index 4f2ed82..6d4c4e8 100644
--- a/utils/vdo/base/Makefile
+++ b/utils/vdo/base/Makefile
@@ -46,6 +46,7 @@ C_WARNS = \
-Wnested-externs \
-Wold-style-definition \
-Wswitch-default \
+ -Wno-address-of-packed-member \
OPT_FLAGS = -O3 -fno-omit-frame-pointer
DEBUG_FLAGS =
diff --git a/utils/vdo/user/Makefile b/utils/vdo/user/Makefile
index b0a60d0..811dd8a 100644
--- a/utils/vdo/user/Makefile
+++ b/utils/vdo/user/Makefile
@@ -48,6 +48,7 @@ C_WARNS = \
-Wnested-externs \
-Wold-style-definition \
-Wswitch-default \
+ -Wno-address-of-packed-member \
OPT_FLAGS = -O3 -fno-omit-frame-pointer
DEBUG_FLAGS =
--
2.21.0

12
0002-fix_dmeventd_linking.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur vdo-1cf3a0b44e81d61d4a0ff8193211ad1297fefa69.orig/utils/vdo/Makefile vdo-1cf3a0b44e81d61d4a0ff8193211ad1297fefa69/utils/vdo/Makefile
--- vdo-1cf3a0b44e81d61d4a0ff8193211ad1297fefa69.orig/utils/vdo/Makefile 2021-05-04 08:26:42.000000000 +0000
+++ vdo-1cf3a0b44e81d61d4a0ff8193211ad1297fefa69/utils/vdo/Makefile 2021-06-01 17:05:02.117033793 +0000
@@ -150,7 +150,7 @@
$(CC) $(LDFLAGS) $^ $(LDPRFLAGS) -o $@
vdoformat: LDPRFLAGS += "-lblkid"
-vdodmeventd: LDPRFLAGS += "-ldevmapper-event"
+vdodmeventd: LDPRFLAGS += -ldevmapper -ldevmapper-event
ifneq ($(MAKECMDGOALS),clean)
DEPSOURCES = $(wildcard *.c)

48
0003-RISC-V-support.patch
View File

@ -2,7 +2,7 @@ diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h
index f468369..673f974 100644 index f468369..673f974 100644
--- a/utils/uds/atomicDefs.h --- a/utils/uds/atomicDefs.h
+++ b/utils/uds/atomicDefs.h +++ b/utils/uds/atomicDefs.h
@@ -98,6 +98,8 @@ static INLINE void smp_mb(void) @@ -99,6 +99,8 @@
__asm__ __volatile__("sync" : : : "memory"); __asm__ __volatile__("sync" : : : "memory");
#elif defined __loongarch64 #elif defined __loongarch64
__asm__ __volatile__("dbar 0" : : : "memory"); __asm__ __volatile__("dbar 0" : : : "memory");
@ -11,7 +11,7 @@ index f468369..673f974 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -125,6 +127,8 @@ static INLINE void smp_rmb(void) @@ -126,6 +128,8 @@
__asm__ __volatile__("lwsync" : : : "memory"); __asm__ __volatile__("lwsync" : : : "memory");
#elif defined __loongarch64 #elif defined __loongarch64
__asm__ __volatile__("dbar 0" : : : "memory"); __asm__ __volatile__("dbar 0" : : : "memory");
@ -20,7 +20,7 @@ index f468369..673f974 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -152,6 +156,8 @@ static INLINE void smp_wmb(void) @@ -153,6 +157,8 @@
__asm__ __volatile__("lwsync" : : : "memory"); __asm__ __volatile__("lwsync" : : : "memory");
#elif defined __loongarch64 #elif defined __loongarch64
__asm__ __volatile__("dbar 0" : : : "memory"); __asm__ __volatile__("dbar 0" : : : "memory");
@ -29,15 +29,6 @@ index f468369..673f974 100644
#else #else
#error "no fence defined" #error "no fence defined"
#endif #endif
@@ -178,7 +184,7 @@ static INLINE void smp_mb__before_atomic(void)
static INLINE void smp_read_barrier_depends(void)
{
#if defined(__x86_64__) || defined(__PPC__) || defined(__s390__) \
- || defined(__aarch64__) || defined(__loongarch64)
+ || defined(__aarch64__) || defined(__loongarch64) || defined(__riscv)
// Nothing needed for these architectures.
#else
// Default to playing it safe.
diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h
index e26d653..f3fd61f 100644 index e26d653..f3fd61f 100644
--- a/utils/uds/cpu.h --- a/utils/uds/cpu.h
@ -48,14 +39,14 @@ index e26d653..f3fd61f 100644
#define CACHE_LINE_BYTES 256 #define CACHE_LINE_BYTES 256
-#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) -#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64)
+#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) || defined(__riscv) +#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) || defined(__riscv)
#define CACHE_LINE_BYTES 64 #define CACHE_LINE_BYTES 64
#else #else
#error "unknown cache line size" #error "unknown cache line size"
diff --git a/utils/uds/Makefile b/utils/uds/Makefile diff --git a/utils/uds/Makefile b/utils/uds/Makefile
index e33d682..ff6ece0 100644 index e33d682..ff6ece0 100644
--- a/utils/uds/Makefile --- a/utils/uds/Makefile
+++ b/utils/uds/Makefile +++ b/utils/uds/Makefile
@@ -32,8 +32,11 @@ ifeq ($(origin CC), default) @@ -32,8 +32,11 @@
CC=gcc CC=gcc
endif endif
@ -68,32 +59,15 @@ index e33d682..ff6ece0 100644
-Werror \ -Werror \
-Wextra \ -Wextra \
-Winit-self \ -Winit-self \
diff --git a/utils/vdo/base/Makefile b/utils/vdo/base/Makefile diff --git a/utils/vdo/Makefile b/utils/vdo/Makefile
index fb009a7..26a8e28 100644 index fb009a7..26a8e28 100644
--- a/utils/vdo/base/Makefile --- a/utils/vdo/Makefile
+++ b/utils/vdo/base/Makefile +++ b/utils/vdo/Makefile
@@ -22,9 +22,12 @@ VDO_VERSION = 6.2.6.14 @@ -22,10 +22,12 @@
UDS_DIR = ../../uds
UDS_DIR = ../uds
+ifeq ($(filter riscv64%,$(MAKE_HOST)),) -
+Wcast-align = -Wcast-align
+endif
WARNS = \
-Wall \
- -Wcast-align \
+ $(Wcast-align) \
-Werror \
-Wextra \
-Winit-self \
diff --git a/utils/vdo/user/Makefile b/utils/vdo/user/Makefile
index 8946fb3..698dede 100644
--- a/utils/vdo/user/Makefile
+++ b/utils/vdo/user/Makefile
@@ -24,9 +24,12 @@ VDO_VERSION = 6.2.6.14
UDS_DIR = ../../uds
VDO_BASE_DIR = ../base
+ifeq ($(filter riscv64%,$(MAKE_HOST)),) +ifeq ($(filter riscv64%,$(MAKE_HOST)),)
+Wcast-align = -Wcast-align +Wcast-align = -Wcast-align
+endif +endif

BIN
6.2.9.7.tar.gz
View File

Binary file not shown.

BIN
8.2.2.2.tar.gz Normal file
View File

Binary file not shown.

61
vdo.spec
View File

@ -1,18 +1,18 @@
Name: vdo Name: vdo
Version: 6.2.9.7 Version: 8.2.2.2
Release: 1 Release: 1
Summary: Management tools for Virtual Data Optimizer Summary: Management tools for Virtual Data Optimizer
License: GPLv2 License: GPLv2
URL: http://github.com/dm-vdo/vdo URL: http://github.com/dm-vdo/vdo
Source0: https://github.com/dm-vdo/vdo/archive/refs/tags/%{version}.tar.gz Source0: https://github.com/dm-vdo/vdo/archive/refs/tags/%{version}.tar.gz
Patch0002: 0002-Ignore-misaligned-pointers.patch Patch0001: 0001-Add-loongarch64-support.patch
Patch0003: 0001-Add-loongarch64-support.patch Patch0002: 0002-fix_dmeventd_linking.patch
Patch0004: 0003-RISC-V-support.patch Patch0003: 0003-RISC-V-support.patch
BuildRequires: gcc libuuid-devel device-mapper-devel device-mapper-event-devel BuildRequires: gcc libuuid-devel device-mapper-devel device-mapper-event-devel
BuildRequires: valgrind-devel python3 python3-devel zlib-devel systemd BuildRequires: valgrind-devel zlib-devel libblkid-devel
%{?systemd_requires} %{?systemd_requires}
Requires: lvm2 >= 2.02 python3-PyYAML >= 3.10 libuuid >= 2.23 kmod-kvdo >= 6.2 util-linux >= 2.32.1 Requires: libuuid >= 2.23 kmod-kvdo >= 6.2 util-linux >= 2.32.1
Provides: kvdo-kmod-common = %{version} Provides: kvdo-kmod-common = %{version}
%define __requires_exclude perl %define __requires_exclude perl
@ -25,66 +25,35 @@ This package provides the user-space management tools for VDO.
%package_help %package_help
%prep %prep
%setup -q %autosetup -n %{name}-%{version} -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%build %build
%make_build %make_build
%install %install
%make_install DESTDIR=%{buildroot} INSTALLOWNER= bindir=%{_bindir} \ %make_install DESTDIR=%{buildroot} INSTALLOWNER= bindir=%{_bindir} \
defaultdocdir=%{_defaultdocdir} name=%{name} \ defaultdocdir=%{_defaultdocdir} name=%{name} mandir=%{_mandir} \
python3_sitelib=%{python3_sitelib} mandir=%{_mandir} \ unitdir=%{_unitdir} presetdir=%{_presetdir} sysconfdir=%{_sysconfdir}
unitdir=%{_unitdir} presetdir=%{_presetdir}
# Fix the python3 shebangs
for file in %{_bindir}/vdo \
%{_bindir}/vdostats
do
pathfix.py -pni "%{__python3}" %{buildroot}${file}
done
%post
%systemd_post vdo.service
%preun
%systemd_preun vdo.service
%postun
%systemd_postun_with_restart vdo.service
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_defaultdocdir}/%{name} %dir %{_defaultdocdir}/%{name}
%doc CONTRIBUTORS.txt README.md %doc CONTRIBUTORS.txt README.md
%dir %{_defaultdocdir}/%{name}/examples
%doc %{_defaultdocdir}/%{name}/examples/* %doc %{_defaultdocdir}/%{name}/examples/*
%license %{_defaultdocdir}/%{name}/COPYING %license %{_defaultdocdir}/%{name}/COPYING
%{_bindir}/* %{_bindir}/*
%dir %{python3_sitelib}/%{name} %dir %{_sysconfdir}/bash_completion.d
%{python3_sitelib}/%{name}/__init__.py %{_sysconfdir}/bash_completion.d/vdostats
%{python3_sitelib}/%{name}/__pycache__/__init__.cpython-*.pyc
%{python3_sitelib}/%{name}/__pycache__/__init__.cpython-*.opt-1.pyc
%dir %{python3_sitelib}/%{name}/vdomgmnt/
%{python3_sitelib}/%{name}/vdomgmnt/*
%dir %{python3_sitelib}/%{name}/statistics/
%{python3_sitelib}/%{name}/statistics/*
%dir %{python3_sitelib}/%{name}/utils/
%{python3_sitelib}/%{name}/utils/*
%{_unitdir}/vdo.service
%{_presetdir}/97-vdo.preset
/bash_completion.d/vdo
/bash_completion.d/vdostats
/etc/udev/rules.d/69-vdo-start-by-dev.rules
/usr/lib/systemd/system/vdo-start-by-dev@.service
/usr/libexec/vdoprepareforlvm
%files help %files help
%defattr(-,root,root) %defattr(-,root,root)
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Tue Feb 27 2024 liyanan <liyanan61@h-partners.com> - 8.2.2.2-1
- Upgrade to 8.2.2.2
* Wed Aug 16 2023 huxintao <806908118@qq.com> - 6.2.9.7-1 * Wed Aug 16 2023 huxintao <806908118@qq.com> - 6.2.9.7-1
- Upgrade to 6.2.9.7 - Upgrade to 6.2.9.7