diff --git a/0001-Add-loongarch64-support.patch b/0001-Add-loongarch64-support.patch deleted file mode 100644 index c765a955576fd87b937943a34d260087bbd4a4ed..0000000000000000000000000000000000000000 --- a/0001-Add-loongarch64-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 249491af07c735d93fc743e413a5304057e43a75 Mon Sep 17 00:00:00 2001 -From: doupengda -Date: Tue, 7 Mar 2023 11:08:46 +0800 -Subject: [PATCH] Add loongarch64 support - ---- - utils/uds/atomicDefs.h | 8 +++++++- - utils/uds/cpu.h | 2 +- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h -index 0aad609..f468369 100644 ---- a/utils/uds/atomicDefs.h -+++ b/utils/uds/atomicDefs.h -@@ -97,6 +97,8 @@ - __asm__ __volatile__("bcr 14,0" : : : "memory"); - #elif defined __PPC__ - __asm__ __volatile__("sync" : : : "memory"); -+#elif defined __loongarch64 -+ __asm__ __volatile__("dbar 0" : : : "memory"); - #else - #error "no fence defined" - #endif -@@ -122,6 +124,8 @@ - __asm__ __volatile__("bcr 14,0" : : : "memory"); - #elif defined __PPC__ - __asm__ __volatile__("lwsync" : : : "memory"); -+#elif defined __loongarch64 -+ __asm__ __volatile__("dbar 0" : : : "memory"); - #else - #error "no fence defined" - #endif -@@ -147,6 +151,8 @@ - __asm__ __volatile__("bcr 14,0" : : : "memory"); - #elif defined __PPC__ - __asm__ __volatile__("lwsync" : : : "memory"); -+#elif defined __loongarch64 -+ __asm__ __volatile__("dbar 0" : : : "memory"); - #else - #error "no fence defined" - #endif -diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h -index 6549f6e..e26d653 100644 ---- a/utils/uds/cpu.h -+++ b/utils/uds/cpu.h -@@ -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(__aarch64__) || defined(__loongarch64) - #define CACHE_LINE_BYTES 64 - #else - #error "unknown cache line size" diff --git a/0002-fix_dmeventd_linking.patch b/0002-fix_dmeventd_linking.patch deleted file mode 100644 index 5f70113a29b53177496a7ce54bab7f7c9b3c555b..0000000000000000000000000000000000000000 --- a/0002-fix_dmeventd_linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) diff --git a/0003-RISC-V-support.patch b/0003-RISC-V-support.patch deleted file mode 100644 index 5469fb240575d69588883745ba48b8bc695cb457..0000000000000000000000000000000000000000 --- a/0003-RISC-V-support.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h -index f468369..673f974 100644 ---- a/utils/uds/atomicDefs.h -+++ b/utils/uds/atomicDefs.h -@@ -99,6 +99,8 @@ - __asm__ __volatile__("sync" : : : "memory"); - #elif defined __loongarch64 - __asm__ __volatile__("dbar 0" : : : "memory"); -+#elif defined __riscv -+ __asm__ __volatile__("fence rw,rw" : : : "memory"); - #else - #error "no fence defined" - #endif -@@ -126,6 +128,8 @@ - __asm__ __volatile__("lwsync" : : : "memory"); - #elif defined __loongarch64 - __asm__ __volatile__("dbar 0" : : : "memory"); -+#elif defined __riscv -+ __asm__ __volatile__("fence r,r" : : : "memory"); - #else - #error "no fence defined" - #endif -@@ -153,6 +157,8 @@ - __asm__ __volatile__("lwsync" : : : "memory"); - #elif defined __loongarch64 - __asm__ __volatile__("dbar 0" : : : "memory"); -+#elif defined __riscv -+ __asm__ __volatile__("fence w,w" : : : "memory"); - #else - #error "no fence defined" - #endif -diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h -index e26d653..f3fd61f 100644 ---- a/utils/uds/cpu.h -+++ b/utils/uds/cpu.h -@@ -36,7 +36,7 @@ - #define CACHE_LINE_BYTES 128 - #elif defined(__s390x__) - #define CACHE_LINE_BYTES 256 --#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) -+#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) || defined(__riscv) - #define CACHE_LINE_BYTES 64 - #else - #error "unknown cache line size" -diff --git a/utils/uds/Makefile b/utils/uds/Makefile -index e33d682..ff6ece0 100644 ---- a/utils/uds/Makefile -+++ b/utils/uds/Makefile -@@ -32,8 +32,11 @@ - CC=gcc - endif - -+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/Makefile b/utils/vdo/Makefile -index fb009a7..26a8e28 100644 ---- a/utils/vdo/Makefile -+++ b/utils/vdo/Makefile -@@ -22,10 +22,12 @@ - - 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/8.2.2.2.tar.gz b/8.2.2.2.tar.gz deleted file mode 100644 index 8c60baa25aab0d9acf5254013c0dcfc452049127..0000000000000000000000000000000000000000 Binary files a/8.2.2.2.tar.gz and /dev/null differ diff --git a/8.3.1.1.tar.gz b/8.3.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dd3cb023d878d0f5cba0d8c5e4171ef07904fc79 Binary files /dev/null and b/8.3.1.1.tar.gz differ diff --git a/vdo.spec b/vdo.spec index 7a2978d3e216f7b8fe46cdcafdfcf577e75b19c2..b0342a6152fcdbb93499e03f2921310919e22471 100644 --- a/vdo.spec +++ b/vdo.spec @@ -1,23 +1,22 @@ +%define bash_completions_dir %{_datadir}/bash-completion/completions + Name: vdo -Version: 8.2.2.2 -Release: 2 +Version: 8.3.1.1 +Release: 1 Summary: Management tools for Virtual Data Optimizer -License: GPLv2 +License: GPL-2.0-only URL: http://github.com/dm-vdo/vdo Source0: https://github.com/dm-vdo/vdo/archive/refs/tags/%{version}.tar.gz -Patch0001: 0001-Add-loongarch64-support.patch -Patch0002: 0002-fix_dmeventd_linking.patch -Patch0003: 0003-RISC-V-support.patch BuildRequires: gcc libuuid-devel device-mapper-devel device-mapper-event-devel BuildRequires: zlib-devel libblkid-devel %ifarch "%{valgrind_arches}" BuildRequires: valgrind-devel %endif -%{?systemd_requires} -Requires: libuuid >= 2.23 kmod-kvdo >= 6.2 util-linux >= 2.32.1 -Provides: kvdo-kmod-common = %{version} +Requires: libuuid >= 2.23 +Requires: kmod-kvdo >= 8.2 +# Disable an automatic dependency due to a file in examples/monitor. %define __requires_exclude perl %description @@ -31,29 +30,29 @@ This package provides the user-space management tools for VDO. %autosetup -n %{name}-%{version} -p1 %build -%make_build +%make_build VDO_VERSION=%{version} %install -%make_install DESTDIR=%{buildroot} INSTALLOWNER= bindir=%{_bindir} \ - defaultdocdir=%{_defaultdocdir} name=%{name} mandir=%{_mandir} \ - unitdir=%{_unitdir} presetdir=%{_presetdir} sysconfdir=%{_sysconfdir} +%make_install INSTALLOWNER= name=%{name} bindir=%{_bindir} \ + mandir=%{_mandir} defaultdocdir=%{_defaultdocdir} libexecdir=%{_libexecdir} \ + presetdir=%{_presetdir} python3_sitelib=/%{python3_sitelib} \ + sysconfdir=%{_sysconfdir} unitdir=%{_unitdir} %files -%defattr(-,root,root) -%dir %{_defaultdocdir}/%{name} +%license COPYING %doc CONTRIBUTORS.txt README.md +%{_bindir}/* %dir %{_defaultdocdir}/%{name}/examples %doc %{_defaultdocdir}/%{name}/examples/* -%license %{_defaultdocdir}/%{name}/COPYING -%{_bindir}/* -%dir %{_sysconfdir}/bash_completion.d -%{_sysconfdir}/bash_completion.d/vdostats +%{bash_completions_dir}/vdostats %files help -%defattr(-,root,root) %{_mandir}/man8/* %changelog +* Wed Mar 26 2025 wangkai <13474090681@163.com> - 8.3.1.1-1 +- Update to 8.3.1.1 + * Sun Apr 28 2024 yinsist - 8.2.2.2-2 - Valgrind does not support certain architectures like RISC-V, Before depending on Valgrind, first check if Valgrind supports the architecture