Compare commits
No commits in common. "ac0d62929e5192ad11657271d8988d79f812d36f" and "b3c10b5bbaf2df01cfbc823112c8236031ae3b85" have entirely different histories.
ac0d62929e
...
b3c10b5bba
@ -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
|
||||||
@@ -97,6 +97,8 @@
|
@@ -96,6 +96,8 @@ static INLINE void smp_mb(void)
|
||||||
__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
|
||||||
@@ -122,6 +124,8 @@
|
@@ -121,6 +123,8 @@ static INLINE void smp_rmb(void)
|
||||||
__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
|
||||||
@@ -147,6 +151,8 @@
|
@@ -146,6 +150,8 @@ static INLINE void smp_wmb(void)
|
||||||
__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,6 +39,15 @@ 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
|
||||||
@ -49,6 +58,9 @@ 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
Normal file
38
0002-Ignore-misaligned-pointers.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -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)
|
|
||||||
@ -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
|
||||||
@@ -99,6 +99,8 @@
|
@@ -98,6 +98,8 @@ static INLINE void smp_mb(void)
|
||||||
__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
|
||||||
@@ -126,6 +128,8 @@
|
@@ -125,6 +127,8 @@ static INLINE void smp_rmb(void)
|
||||||
__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
|
||||||
@@ -153,6 +157,8 @@
|
@@ -152,6 +156,8 @@ static INLINE void smp_wmb(void)
|
||||||
__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,6 +29,15 @@ 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
|
||||||
@ -39,14 +48,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 @@
|
@@ -32,8 +32,11 @@ ifeq ($(origin CC), default)
|
||||||
CC=gcc
|
CC=gcc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -59,15 +68,32 @@ index e33d682..ff6ece0 100644
|
|||||||
-Werror \
|
-Werror \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Winit-self \
|
-Winit-self \
|
||||||
diff --git a/utils/vdo/Makefile b/utils/vdo/Makefile
|
diff --git a/utils/vdo/base/Makefile b/utils/vdo/base/Makefile
|
||||||
index fb009a7..26a8e28 100644
|
index fb009a7..26a8e28 100644
|
||||||
--- a/utils/vdo/Makefile
|
--- a/utils/vdo/base/Makefile
|
||||||
+++ b/utils/vdo/Makefile
|
+++ b/utils/vdo/base/Makefile
|
||||||
@@ -22,10 +22,12 @@
|
@@ -22,9 +22,12 @@ VDO_VERSION = 6.2.6.14
|
||||||
|
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
|
||||||
|
|||||||
@ -1,239 +0,0 @@
|
|||||||
diff -uNr vdo-8.2.2.2-patchedbackup/utils/uds/Makefile vdo-8.2.2.2-patched/utils/uds/Makefile
|
|
||||||
--- vdo-8.2.2.2-patchedbackup/utils/uds/Makefile 2024-09-27 10:05:29.529846385 +0800
|
|
||||||
+++ vdo-8.2.2.2-patched/utils/uds/Makefile 2024-09-27 10:34:25.699840596 +0800
|
|
||||||
@@ -22,42 +22,46 @@
|
|
||||||
|
|
||||||
DEPDIR = .deps
|
|
||||||
|
|
||||||
-ifeq ($(origin CC), default)
|
|
||||||
- CC=gcc
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
ifeq ($(filter riscv64%,$(MAKE_HOST)),)
|
|
||||||
Wcast-align = -Wcast-align
|
|
||||||
endif
|
|
||||||
-WARNS = -Wall \
|
|
||||||
- $(Wcast-align) \
|
|
||||||
- -Werror \
|
|
||||||
- -Wextra \
|
|
||||||
- -Winit-self \
|
|
||||||
- -Wlogical-op \
|
|
||||||
- -Wmissing-include-dirs \
|
|
||||||
- -Wpointer-arith \
|
|
||||||
- -Wredundant-decls \
|
|
||||||
- -Wunused \
|
|
||||||
- -Wwrite-strings
|
|
||||||
-
|
|
||||||
-C_WARNS = -Wbad-function-cast \
|
|
||||||
- -Wcast-qual \
|
|
||||||
- -Wfloat-equal \
|
|
||||||
- -Wformat=2 \
|
|
||||||
- -Wmissing-declarations \
|
|
||||||
- -Wmissing-format-attribute \
|
|
||||||
- -Wmissing-prototypes \
|
|
||||||
- -Wnested-externs \
|
|
||||||
- -Wold-style-definition \
|
|
||||||
- -Wswitch-default
|
|
||||||
+
|
|
||||||
+# Define WARNS and C_WARNS only if using gcc
|
|
||||||
+CLANG_VERSION := $(shell $(CC) --version | grep -i clang)
|
|
||||||
+ifeq ($(findstring clang, $(CLANG_VERSION)),clang)
|
|
||||||
+WARNS =
|
|
||||||
+C_WARNS =
|
|
||||||
+else
|
|
||||||
+WARNS = -Wall \
|
|
||||||
+ $(Wcast-align) \
|
|
||||||
+ -Werror \
|
|
||||||
+ -Wextra \
|
|
||||||
+ -Winit-self \
|
|
||||||
+ -Wlogical-op \
|
|
||||||
+ -Wmissing-include-dirs \
|
|
||||||
+ -Wpointer-arith \
|
|
||||||
+ -Wredundant-decls \
|
|
||||||
+ -Wunused \
|
|
||||||
+ -Wwrite-strings
|
|
||||||
+
|
|
||||||
+C_WARNS = -Wbad-function-cast \
|
|
||||||
+ -Wcast-qual \
|
|
||||||
+ -Wfloat-equal \
|
|
||||||
+ -Wformat=2 \
|
|
||||||
+ -Wmissing-declarations \
|
|
||||||
+ -Wmissing-format-attribute \
|
|
||||||
+ -Wmissing-prototypes \
|
|
||||||
+ -Wnested-externs \
|
|
||||||
+ -Wold-style-definition \
|
|
||||||
+ -Wswitch-default
|
|
||||||
+endif
|
|
||||||
|
|
||||||
OPT_FLAGS = -O3 -fno-omit-frame-pointer
|
|
||||||
DEBUG_FLAGS =
|
|
||||||
RPM_OPT_FLAGS ?= -fpic
|
|
||||||
-GLOBAL_FLAGS = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS) \
|
|
||||||
- $(WARNS) $(shell getconf LFS_CFLAGS) $(DEBUG_FLAGS) \
|
|
||||||
- -DCURRENT_VERSION='"$(BUILD_VERSION)"' \
|
|
||||||
+GLOBAL_FLAGS = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS) \
|
|
||||||
+ $(WARNS) $(shell getconf LFS_CFLAGS) $(DEBUG_FLAGS) \
|
|
||||||
+ -DCURRENT_VERSION='"$(BUILD_VERSION)"'
|
|
||||||
|
|
||||||
CFLAGS = $(GLOBAL_FLAGS) -I. -std=gnu99 -pedantic $(C_WARNS) $(MY_CFLAGS)
|
|
||||||
LDFLAGS = $(RPM_LD_FLAGS) $(MY_LDFLAGS)
|
|
||||||
@@ -69,48 +73,48 @@
|
|
||||||
vpath %.c .
|
|
||||||
vpath %.c ./murmur
|
|
||||||
|
|
||||||
-UDS_OBJECTS = murmurhash3.o \
|
|
||||||
- buffer.o \
|
|
||||||
- buffered-reader.o \
|
|
||||||
- buffered-writer.o \
|
|
||||||
- chapter-index.o \
|
|
||||||
- config.o \
|
|
||||||
- delta-index.o \
|
|
||||||
- errors.o \
|
|
||||||
- event-count.o \
|
|
||||||
- fileIORegion.o \
|
|
||||||
- fileUtils.o \
|
|
||||||
- funnel-queue.o \
|
|
||||||
- geometry.o \
|
|
||||||
- hash-utils.o \
|
|
||||||
- index.o \
|
|
||||||
- index-layout.o \
|
|
||||||
- index-page-map.o \
|
|
||||||
- index-session.o \
|
|
||||||
- ioFactory.o \
|
|
||||||
- logger.o \
|
|
||||||
- memoryAlloc.o \
|
|
||||||
- minisyslog.o \
|
|
||||||
- open-chapter.o \
|
|
||||||
- page-cache.o \
|
|
||||||
- permassert.o \
|
|
||||||
- radix-sort.o \
|
|
||||||
- random.o \
|
|
||||||
- record-page.o \
|
|
||||||
- requestQueue.o \
|
|
||||||
- sparse-cache.o \
|
|
||||||
- string-utils.o \
|
|
||||||
- syscalls.o \
|
|
||||||
- threadCondVar.o \
|
|
||||||
- threadMutex.o \
|
|
||||||
- threadSemaphore.o \
|
|
||||||
- time-utils.o \
|
|
||||||
- uds-threads.o \
|
|
||||||
- volume.o \
|
|
||||||
- volume-index005.o \
|
|
||||||
- volume-index006.o \
|
|
||||||
- volume-index-ops.o \
|
|
||||||
- volume-store.o
|
|
||||||
+UDS_OBJECTS = murmurhash3.o \
|
|
||||||
+ buffer.o \
|
|
||||||
+ buffered-reader.o \
|
|
||||||
+ buffered-writer.o \
|
|
||||||
+ chapter-index.o \
|
|
||||||
+ config.o \
|
|
||||||
+ delta-index.o \
|
|
||||||
+ errors.o \
|
|
||||||
+ event-count.o \
|
|
||||||
+ fileIORegion.o \
|
|
||||||
+ fileUtils.o \
|
|
||||||
+ funnel-queue.o \
|
|
||||||
+ geometry.o \
|
|
||||||
+ hash-utils.o \
|
|
||||||
+ index.o \
|
|
||||||
+ index-layout.o \
|
|
||||||
+ index-page-map.o \
|
|
||||||
+ index-session.o \
|
|
||||||
+ ioFactory.o \
|
|
||||||
+ logger.o \
|
|
||||||
+ memoryAlloc.o \
|
|
||||||
+ minisyslog.o \
|
|
||||||
+ open-chapter.o \
|
|
||||||
+ page-cache.o \
|
|
||||||
+ permassert.o \
|
|
||||||
+ radix-sort.o \
|
|
||||||
+ random.o \
|
|
||||||
+ record-page.o \
|
|
||||||
+ requestQueue.o \
|
|
||||||
+ sparse-cache.o \
|
|
||||||
+ string-utils.o \
|
|
||||||
+ syscalls.o \
|
|
||||||
+ threadCondVar.o \
|
|
||||||
+ threadMutex.o \
|
|
||||||
+ threadSemaphore.o \
|
|
||||||
+ time-utils.o \
|
|
||||||
+ uds-threads.o \
|
|
||||||
+ volume.o \
|
|
||||||
+ volume-index005.o \
|
|
||||||
+ volume-index006.o \
|
|
||||||
+ volume-index-ops.o \
|
|
||||||
+ volume-store.o
|
|
||||||
|
|
||||||
.PHONY: all
|
|
||||||
all: libuds.a
|
|
||||||
@@ -129,7 +133,6 @@
|
|
||||||
%.s: %.c
|
|
||||||
$(CC) $(CFLAGS) -S $^
|
|
||||||
|
|
||||||
-
|
|
||||||
########################################################################
|
|
||||||
# Dependency processing
|
|
||||||
|
|
||||||
diff -uNr vdo-8.2.2.2-patchedbackup/utils/vdo/Makefile vdo-8.2.2.2-patched/utils/vdo/Makefile
|
|
||||||
--- vdo-8.2.2.2-patchedbackup/utils/vdo/Makefile 2024-09-27 10:05:29.529846385 +0800
|
|
||||||
+++ vdo-8.2.2.2-patched/utils/vdo/Makefile 2024-09-27 10:34:19.959840728 +0800
|
|
||||||
@@ -25,30 +25,34 @@
|
|
||||||
ifeq ($(filter riscv64%,$(MAKE_HOST)),)
|
|
||||||
Wcast-align = -Wcast-align
|
|
||||||
endif
|
|
||||||
-WARNS = \
|
|
||||||
- -Wall \
|
|
||||||
- $(Wcast-align) \
|
|
||||||
- -Werror \
|
|
||||||
- -Wextra \
|
|
||||||
- -Winit-self \
|
|
||||||
- -Wlogical-op \
|
|
||||||
- -Wmissing-include-dirs \
|
|
||||||
- -Wpointer-arith \
|
|
||||||
- -Wredundant-decls \
|
|
||||||
- -Wunused \
|
|
||||||
- -Wwrite-strings \
|
|
||||||
+CLANG_VERSION := $(shell $(CC) --version | grep -i clang)
|
|
||||||
+ifeq ($(findstring clang, $(CLANG_VERSION)),clang)
|
|
||||||
+WARNS =
|
|
||||||
+C_WARNS =
|
|
||||||
+else
|
|
||||||
+WARNS = -Wall \
|
|
||||||
+ $(Wcast-align) \
|
|
||||||
+ -Werror \
|
|
||||||
+ -Wextra \
|
|
||||||
+ -Winit-self \
|
|
||||||
+ -Wlogical-op \
|
|
||||||
+ -Wmissing-include-dirs \
|
|
||||||
+ -Wpointer-arith \
|
|
||||||
+ -Wredundant-decls \
|
|
||||||
+ -Wunused \
|
|
||||||
+ -Wwrite-strings
|
|
||||||
|
|
||||||
-C_WARNS = \
|
|
||||||
- -Wbad-function-cast \
|
|
||||||
- -Wcast-qual \
|
|
||||||
- -Wfloat-equal \
|
|
||||||
- -Wformat=2 \
|
|
||||||
- -Wmissing-declarations \
|
|
||||||
- -Wmissing-format-attribute \
|
|
||||||
- -Wmissing-prototypes \
|
|
||||||
- -Wnested-externs \
|
|
||||||
- -Wold-style-definition \
|
|
||||||
- -Wswitch-default \
|
|
||||||
+C_WARNS = -Wbad-function-cast \
|
|
||||||
+ -Wcast-qual \
|
|
||||||
+ -Wfloat-equal \
|
|
||||||
+ -Wformat=2 \
|
|
||||||
+ -Wmissing-declarations \
|
|
||||||
+ -Wmissing-format-attribute \
|
|
||||||
+ -Wmissing-prototypes \
|
|
||||||
+ -Wnested-externs \
|
|
||||||
+ -Wold-style-definition \
|
|
||||||
+ -Wswitch-default
|
|
||||||
+endif
|
|
||||||
|
|
||||||
ifeq ($(AR), ar)
|
|
||||||
ifeq ($(origin AR), default)
|
|
||||||
BIN
6.2.6.14.tar.gz
Normal file
BIN
6.2.6.14.tar.gz
Normal file
Binary file not shown.
BIN
8.2.2.2.tar.gz
BIN
8.2.2.2.tar.gz
Binary file not shown.
74
vdo.spec
74
vdo.spec
@ -1,22 +1,18 @@
|
|||||||
Name: vdo
|
Name: vdo
|
||||||
Version: 8.2.2.2
|
Version: 6.2.6.14
|
||||||
Release: 3
|
Release: 3
|
||||||
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
|
||||||
Patch0001: 0001-Add-loongarch64-support.patch
|
Patch0002: 0002-Ignore-misaligned-pointers.patch
|
||||||
Patch0002: 0002-fix_dmeventd_linking.patch
|
Patch0003: 0001-Add-loongarch64-support.patch
|
||||||
Patch0003: 0003-RISC-V-support.patch
|
Patch0004: 0003-RISC-V-support.patch
|
||||||
Patch0004: 0004-clang-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: zlib-devel libblkid-devel
|
BuildRequires: valgrind-devel python3 python3-devel zlib-devel systemd
|
||||||
%ifarch "%{valgrind_arches}"
|
|
||||||
BuildRequires: valgrind-devel
|
|
||||||
%endif
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
Requires: libuuid >= 2.23 kmod-kvdo >= 6.2 util-linux >= 2.32.1
|
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}
|
Provides: kvdo-kmod-common = %{version}
|
||||||
|
|
||||||
%define __requires_exclude perl
|
%define __requires_exclude perl
|
||||||
@ -29,44 +25,66 @@ This package provides the user-space management tools for VDO.
|
|||||||
%package_help
|
%package_help
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%setup -q
|
||||||
|
%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} mandir=%{_mandir} \
|
defaultdocdir=%{_defaultdocdir} name=%{name} \
|
||||||
unitdir=%{_unitdir} presetdir=%{_presetdir} sysconfdir=%{_sysconfdir}
|
python3_sitelib=%{python3_sitelib} mandir=%{_mandir} \
|
||||||
|
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 %{_sysconfdir}/bash_completion.d
|
%dir %{python3_sitelib}/%{name}
|
||||||
%{_sysconfdir}/bash_completion.d/vdostats
|
%{python3_sitelib}/%{name}/__init__.py
|
||||||
|
%{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 Aug 27 2024 shenchenbang <1944340417@qq.com> - 8.2.2.2-3
|
|
||||||
- Fix add if else to support clang
|
|
||||||
|
|
||||||
* Sun Apr 28 2024 yinsist <jianhui.oerv@isrc.iscas.ac.cn> - 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
|
|
||||||
|
|
||||||
* 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
|
|
||||||
- Upgrade to 6.2.9.7
|
|
||||||
|
|
||||||
* Fri Mar 17 2023 laokz <zhangkai@iscas.ac.cn> - 6.2.6.14-3
|
* Fri Mar 17 2023 laokz <zhangkai@iscas.ac.cn> - 6.2.6.14-3
|
||||||
- Add RISC-V support (Patch by YukariChiba<i@0x7f.cc>)
|
- Add RISC-V support (Patch by YukariChiba<i@0x7f.cc>)
|
||||||
- Source of fence commands: RISC-V ISA Spec from riscv.org
|
- Source of fence commands: RISC-V ISA Spec from riscv.org
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user