diff --git a/0002-Ignore-misaligned-pointers.patch b/0002-Ignore-misaligned-pointers.patch deleted file mode 100644 index 85cc8620837ac465773f8cc13f37018c35910b82..0000000000000000000000000000000000000000 --- a/0002-Ignore-misaligned-pointers.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a85f6e9973697f90d11e9beb1eb16206774e4767 Mon Sep 17 00:00:00 2001 -From: "Christopher N. Hesse" -Date: Wed, 3 Apr 2019 22:24:29 +0200 -Subject: [PATCH 2/2] Ignore misaligned pointers - -Signed-off-by: Christopher N. Hesse ---- - 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 - diff --git a/3000-add-loongarch64-support.patch b/3000-add-loongarch64-support.patch index ec6e6b78ea9f8d3ec69b0163f67c8e8e5cef02f1..cf8089b6ea2f15c9ef42e7236eedc906d99db2aa 100644 --- a/3000-add-loongarch64-support.patch +++ b/3000-add-loongarch64-support.patch @@ -1,18 +1,18 @@ From 5671abc0df13895d2f13a4646a6ebd2af29f37ca Mon Sep 17 00:00:00 2001 From: Huang Yang Date: Tue, 14 Feb 2023 11:34:45 +0800 -Subject: [PATCH] vdo 6.2.0.298 add loongarch64 support +Subject: [PATCH] vdo 8.1.0.264 add loongarch64 support --- - utils/uds/atomicDefs.h | 8 +++++++- + utils/uds/atomicDefs.h | 6 ++++++ utils/uds/cpu.h | 2 +- - 2 files changed, 8 insertions(+), 2 deletions(-) + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h -index 86d6a4a..2508f40 100644 +index 1552783..68fa8ee 100644 --- a/utils/uds/atomicDefs.h +++ b/utils/uds/atomicDefs.h -@@ -96,6 +96,8 @@ static INLINE void smp_mb(void) +@@ -97,6 +97,8 @@ static INLINE void smp_mb(void) __asm__ __volatile__("bcr 14,0" : : : "memory"); #elif defined __PPC__ __asm__ __volatile__("sync" : : : "memory"); @@ -21,7 +21,7 @@ index 86d6a4a..2508f40 100644 #else #error "no fence defined" #endif -@@ -121,6 +123,8 @@ static INLINE void smp_rmb(void) +@@ -122,6 +124,8 @@ static INLINE void smp_rmb(void) __asm__ __volatile__("bcr 14,0" : : : "memory"); #elif defined __PPC__ __asm__ __volatile__("lwsync" : : : "memory"); @@ -30,7 +30,7 @@ index 86d6a4a..2508f40 100644 #else #error "no fence defined" #endif -@@ -146,6 +150,8 @@ static INLINE void smp_wmb(void) +@@ -147,6 +151,8 @@ static INLINE void smp_wmb(void) __asm__ __volatile__("bcr 14,0" : : : "memory"); #elif defined __PPC__ __asm__ __volatile__("lwsync" : : : "memory"); @@ -39,17 +39,8 @@ index 86d6a4a..2508f40 100644 #else #error "no fence defined" #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 -index 8b12a16..d987a1a 100644 +index 5e36066..3681cc6 100644 --- a/utils/uds/cpu.h +++ b/utils/uds/cpu.h @@ -36,7 +36,7 @@ @@ -58,7 +49,7 @@ index 8b12a16..d987a1a 100644 #define CACHE_LINE_BYTES 256 -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) - #define CACHE_LINE_BYTES 64 + #define CACHE_LINE_BYTES 64 #else #error "unknown cache line size" -- diff --git a/3001-add-sw_64-support.patch b/3001-add-sw_64-support.patch index 12d519f6d114f5a4ec4b761a4168e31e07b10c70..8c40977c3f498f2b02413b43874f372e0811b285 100644 --- a/3001-add-sw_64-support.patch +++ b/3001-add-sw_64-support.patch @@ -1,8 +1,8 @@ diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h -index ea55f57..28de90d 100644 +index 68fa8ee..578c987 100644 --- a/utils/uds/atomicDefs.h +++ b/utils/uds/atomicDefs.h -@@ -98,6 +98,8 @@ static INLINE void smp_mb(void) +@@ -99,6 +99,8 @@ static INLINE void smp_mb(void) __asm__ __volatile__("sync" : : : "memory"); #elif defined __loongarch64 __asm__ __volatile__("dbar 0" : : : "memory"); @@ -11,7 +11,7 @@ index ea55f57..28de90d 100644 #else #error "no fence defined" #endif -@@ -125,6 +127,8 @@ static INLINE void smp_rmb(void) +@@ -126,6 +128,8 @@ static INLINE void smp_rmb(void) __asm__ __volatile__("lwsync" : : : "memory"); #elif defined __loongarch64 __asm__ __volatile__("dbar 0" : : : "memory"); @@ -20,7 +20,7 @@ index ea55f57..28de90d 100644 #else #error "no fence defined" #endif -@@ -152,6 +156,8 @@ static INLINE void smp_wmb(void) +@@ -153,6 +157,8 @@ static INLINE void smp_wmb(void) __asm__ __volatile__("lwsync" : : : "memory"); #elif defined __loongarch64 __asm__ __volatile__("dbar 0" : : : "memory"); @@ -29,17 +29,8 @@ index ea55f57..28de90d 100644 #else #error "no fence defined" #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(__sw_64__) - // Nothing needed for these architectures. - #else - // Default to playing it safe. diff --git a/utils/uds/cpu.h b/utils/uds/cpu.h -index e26d653..67ce745 100644 +index 3681cc6..12e27ac 100644 --- a/utils/uds/cpu.h +++ b/utils/uds/cpu.h @@ -36,7 +36,7 @@ @@ -47,7 +38,10 @@ index e26d653..67ce745 100644 #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(__sw_64__) - #define CACHE_LINE_BYTES 64 ++#elif defined(__x86_64__) || defined(__aarch64__) || defined(__loongarch64) || defined(__sw_64__) + #define CACHE_LINE_BYTES 64 #else #error "unknown cache line size" +-- +2.33.0 + diff --git a/3002-del-Wcast-align-for-sw_64.patch b/3002-del-Wcast-align-for-sw_64.patch deleted file mode 100644 index 6744027add1225c39511d59853bcfd0a5483ec9b..0000000000000000000000000000000000000000 --- a/3002-del-Wcast-align-for-sw_64.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/utils/uds/Makefile b/utils/uds/Makefile -index e33d682..22ec52c 100644 ---- a/utils/uds/Makefile -+++ b/utils/uds/Makefile -@@ -33,7 +33,6 @@ ifeq ($(origin CC), default) - endif - - WARNS = -Wall \ -- -Wcast-align \ - -Werror \ - -Wextra \ - -Winit-self \ -diff --git a/utils/vdo/base/Makefile b/utils/vdo/base/Makefile -index fb009a7..9f43146 100644 ---- a/utils/vdo/base/Makefile -+++ b/utils/vdo/base/Makefile -@@ -24,7 +24,6 @@ UDS_DIR = ../../uds - - WARNS = \ - -Wall \ -- -Wcast-align \ - -Werror \ - -Wextra \ - -Winit-self \ -diff --git a/utils/vdo/user/Makefile b/utils/vdo/user/Makefile -index 8946fb3..6dc547f 100644 ---- a/utils/vdo/user/Makefile -+++ b/utils/vdo/user/Makefile -@@ -26,7 +26,6 @@ VDO_BASE_DIR = ../base - - WARNS = \ - -Wall \ -- -Wcast-align \ - -Werror \ - -Wextra \ - -Winit-self \ diff --git a/6.2.6.14.tar.gz b/6.2.6.14.tar.gz deleted file mode 100644 index bac9ecc375d5912012e78e7aa3f919b42e877e26..0000000000000000000000000000000000000000 Binary files a/6.2.6.14.tar.gz and /dev/null differ diff --git a/8.1.0.264.tar.gz b/8.1.0.264.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..34831a08ce6ae956f62996b22955452828b95917 Binary files /dev/null and b/8.1.0.264.tar.gz differ diff --git a/Adapt-service-file.patch b/Adapt-service-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c08410887208055f6c3c2f050e66bc8230dc74f --- /dev/null +++ b/Adapt-service-file.patch @@ -0,0 +1,30 @@ +From ec4859836b01af44977421edda5670045fca5c0a Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Tue, 7 May 2024 19:52:23 +0800 +Subject: [PATCH] adapt service file + +--- + examples/systemd/vdo.service | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/examples/systemd/vdo.service b/examples/systemd/vdo.service +index abfd836..3bf9371 100644 +--- a/examples/systemd/vdo.service ++++ b/examples/systemd/vdo.service +@@ -1,3 +1,13 @@ + [Unit] + Description=VDO volume services (provided for compatibility) + Documentation=man:vdo(8) ++After=systemd-remount-fs.service ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=/usr/bin/vdo start --all --confFile /etc/vdoconf.yml ++ExecStop=/usr/bin/vdo stop --all --confFile /etc/vdoconf.yml ++ ++[Install] ++WantedBy=multi-user.target +-- +2.33.0 + diff --git a/vdo.spec b/vdo.spec index 3d0c29f31fb61cc1cfb5a1a64d018145f758e79b..693d5248f8bb0f1471f02513f2b4a9cb597e3145 100644 --- a/vdo.spec +++ b/vdo.spec @@ -1,22 +1,16 @@ Name: vdo -Version: 6.2.6.14 -Release: 2 +Version: 8.1.0.264 +Release: 1 Summary: Management tools for Virtual Data Optimizer License: GPLv2 URL: http://github.com/dm-vdo/vdo Source0: https://github.com/dm-vdo/vdo/archive/refs/tags/%{version}.tar.gz -Patch0002: 0002-Ignore-misaligned-pointers.patch Patch3000: 3000-add-loongarch64-support.patch Patch3001: 3001-add-sw_64-support.patch -%ifarch sw_64 -Patch3002: 3002-del-Wcast-align-for-sw_64.patch -%endif +Patch0: Adapt-service-file.patch BuildRequires: gcc libuuid-devel device-mapper-devel device-mapper-event-devel -BuildRequires: python3 python3-devel zlib-devel systemd -%ifarch %{valgrind_arches} -BuildRequires: valgrind-devel -%endif +BuildRequires: valgrind-devel python3 python3-devel zlib-devel systemd %{?systemd_requires} Requires: lvm2 >= 2.02 python3-PyYAML >= 3.10 libuuid >= 2.23 kmod-kvdo >= 6.2 util-linux >= 2.32.1 Provides: kvdo-kmod-common = %{version} @@ -81,13 +75,15 @@ done /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 %defattr(-,root,root) %{_mandir}/man8/* %changelog +* Tue May 07 2024 Ge Wang - 8.1.0.264-1 +- Upgrade to 8.1.0.264 + * Thu Aug 10 2023 yeqinglong - 6.2.6.14-2 - add loongarch64 and sw_64 support