diff --git a/0002-fix-dmraid-help-coredump-on-aarch64.patch b/0002-fix-dmraid-help-coredump-on-aarch64.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f6d30af2b4333fb6b9a0a370d3974b0d3fde232 --- /dev/null +++ b/0002-fix-dmraid-help-coredump-on-aarch64.patch @@ -0,0 +1,26 @@ +From eaa8195d00fb6e404e86e0bd6eab1313d175798c Mon Sep 17 00:00:00 2001 +From: Chunmei Xu +Date: Mon, 24 Oct 2022 17:08:52 +0800 +Subject: [PATCH] fix dmraid --help coredump on aarch64 + +Signed-off-by: Chunmei Xu +--- + tools/commands.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/commands.c b/tools/commands.c +index 74d612b..9b69c86 100644 +--- a/tools/commands.c ++++ b/tools/commands.c +@@ -259,7 +259,7 @@ help(struct lib_context *lc, struct actions *a) + "\t[--size [0-9]...[kKgG][bB]]\n" + "\t[--str[i[de]] [0-9]...[kK][bB]]\n" + "\t{--disk[s] \"device-path[, device-path...\"}\n", c); +- log_print(lc, "%s\t{-x|--remove RAID-set} \n"); ++ log_print(lc, "%s\t{-x|--remove RAID-set} \n", c); + log_print(lc, "%s\t{-R|--rebuild} RAID-set [drive_name]\n", c); + log_print(lc, "%s\t[{-f|--format FORMAT}]\n" + "\t{-S|--spare [RAID-set]} \n" +-- +2.19.1.6.gb485710b + diff --git a/dmraid.spec b/dmraid.spec index dd58812da6ad3afe9f463f208fc551150f4e9a60..8bd28470e9da2c6231609bb9a4f014a231084d75 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define dmraid_release 3 Summary: Device-mapper RAID tool and library Name: dmraid @@ -24,13 +24,12 @@ Recommends: dmraid-events = %{version}-%{release} Conflicts: dmraid < 1.0.0.rc16 Obsoletes: dmraid < 1.0.0.rc16 -# This was:https://people.redhat.com/heinzm/sw/dmraid/src/dmraid-1.0.0.rc16.tar.bz2 -# but that link no longer works -Source0: %{name}-%{version}-%{dmraid_release}.tar.bz2 +Source0: https://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}-%{dmraid_release}.tar.bz2 Source1: anolis-dmraid-activation Source2: dmraid-activation.service Patch0: 0001-fix-compilation-error.patch +Patch1: 0002-fix-dmraid-help-coredump-on-aarch64.patch %description DMRAID supports RAID device discovery, RAID set activation, creation, @@ -168,5 +167,8 @@ rm -f %{buildroot}%{_prefix}/lib/libdmraid.a %ghost /var/cache/logwatch/dmeventd/syslogpattern.txt %changelog -* Mon Apr 11 2022 Zhongling He 1.0.0.rc16-1 +* Mon Oct 24 2022 Chunmei Xu - 1.0.0.rc16-2 +- fix dmraid --help coredump on aarch64 + +* Mon Apr 11 2022 Zhongling He - 1.0.0.rc16-1 - Init package from upstream v1.0.0.rc16