From 08bf795f631a38b1ee3864a76d11b4bf412fe28d Mon Sep 17 00:00:00 2001 From: wangzhe Date: Fri, 24 Jan 2025 17:29:22 +0800 Subject: [PATCH] [Bug] rebuild to fix the bug of incremental backup to #IBJOCY rebuild to fix the bug of incremental backup Signed-off-by: wangzhe --- 1001-add-arm-support-in-restore.patch | 28 +++++++++++++++++++++++++++ dump.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 1001-add-arm-support-in-restore.patch diff --git a/1001-add-arm-support-in-restore.patch b/1001-add-arm-support-in-restore.patch new file mode 100644 index 0000000..dca579f --- /dev/null +++ b/1001-add-arm-support-in-restore.patch @@ -0,0 +1,28 @@ +From aec6134dfe370cdb027796b0faaf732f8047a259 Mon Sep 17 00:00:00 2001 +From: happy_orange +Date: Fri, 24 Jan 2025 16:46:57 +0800 +Subject: [PATCH 1/1] add arm support in restore + +--- + restore/xattr.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/restore/xattr.c b/restore/xattr.c +index 0c1b547..a655aee 100644 +--- a/restore/xattr.c ++++ b/restore/xattr.c +@@ -158,6 +158,11 @@ struct ext2_xattr_entry { + # define __NR_lsetxattr (__NR_SYSCALL_BASE+227) + # define __NR_lgetxattr (__NR_SYSCALL_BASE+230) + # define __NR_llistxattr (__NR_SYSCALL_BASE+233) ++#elif defined (__aarch64__) ++# define HAVE_XATTR_SYSCALLS 1 ++# define __NR_lsetxattr 6 ++# define __NR_lgetxattr 9 ++# define __NR_llistxattr 12 + #elif defined (__mips64__) + # define HAVE_XATTR_SYSCALLS 1 + # define __NR_Linux 5000 +-- +2.43.5 + diff --git a/dump.spec b/dump.spec index 4cf55e2..c04fbb8 100644 --- a/dump.spec +++ b/dump.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 %define PREVER b46 %define DUMP_VERSION 0.4%{PREVER} @@ -27,6 +27,7 @@ Provides: dump-static Patch0: dump-buildfix.patch Patch1: dump-remove-lzo.patch +Patch1001: 1001-add-arm-support-in-restore.patch %description The dump package contains both dump and restore. Dump examines files @@ -53,6 +54,7 @@ Doc pages for %{name}. %patch0 -p1 -b .buildfix %patch1 -p1 -b .remove-lzo +%patch1001 -p1 for i in MAINTAINERS COPYING ChangeLog; do iconv -f iso-8859-1 -t utf-8 $i -o $i.new @@ -121,6 +123,9 @@ rm -rf %{buildroot} %doc dump.lsm %changelog +* Fri Jan 24 2025 happy_orange - 0.4-0.36.b46.0.3 +- add aarch64 support in restore + * Sun Jul 17 2022 Bo Ren - 0.4-0.36.b46.0.2 - Add doc sub package -- Gitee