rpms/mdadm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import mdadm-4.2-2.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-05-10 03:18:56 -04:00 committed by Stepan Oksanichenko
parent 7c319bb937
commit 0fe07a9a19
4 changed files with 60 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/mdadm-4.2-rc2.tar.xz
SOURCES/mdadm-4.2.tar.xz

2
.mdadm.metadata
View File

@ -1 +1 @@
b6e99ec4b0c3953505dc2e6ef6e8f2a71a26207d SOURCES/mdadm-4.2-rc2.tar.xz
27f240cff200e00c28a486a028bcdb14f67f8790 SOURCES/mdadm-4.2.tar.xz

38
SOURCES/0001-Revert-mdadm-fix-coredump-of-mdadm-monitor-r.patch Normal file
View File

@ -0,0 +1,38 @@
From 7e92ef334af165a5e50b33ddff98e18f1c8a18d0 Mon Sep 17 00:00:00 2001
From: Xiao Ni <xni@redhat.com>
Date: Thu, 24 Feb 2022 11:37:34 +0800
Subject: [PATCH 1/1] Revert "mdadm: fix coredump of mdadm --monitor -r"
This reverts commit 546047688e1c64638f462147c755b58119cabdc8.
This is a rhel ony patch. We have sent patch to upstream. But
it hasn't been merged. We will remove this patch once upstream
merges our patch.
Signed-off-by: Xiao Ni <xni@redhat.com>
---
ReadMe.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ReadMe.c b/ReadMe.c
index 81399765..ee457a54 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -81,11 +81,11 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";
* found, it is started.
*/
-char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k";
+char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
char short_bitmap_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
+ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
char short_bitmap_auto_options[]=
- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
+ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
struct option long_options[] = {
{"manage", 0, 0, ManageOpt},
--
2.31.1

25
SPECS/mdadm.spec
View File

@ -1,9 +1,10 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 4.2
%define subversion rc2
Release: rc2%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-%{subversion}.tar.xz
# extraversion is used to define rhel internal version
%define extraversion 2
Release: %{extraversion}%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}%{?subversion:-%{subversion}}.tar.xz
Source1: mdmonitor.init
Source2: raid-check
Source3: mdadm.rules
@ -16,6 +17,7 @@ Source9: mdcheck
Source10: mdadm_env.sh
Patch000: disable-Werror.patch
Patch001: 0001-Revert-mdadm-fix-coredump-of-mdadm-monitor-r.patch
# RHEL customization patches
Patch200: mdadm-3.3-udev.patch
@ -44,16 +46,17 @@ almost all functions without a configuration file, though a configuration
file can be used to help with some common tasks.
%prep
%setup -q -n %{name}-%{version}_%{subversion}
%setup -q -n %{name}-%{version}%{?subversion:_%{subversion}}
%patch000 -p1 -b .disable
%patch001 -p1 -b .0001
# RHEL customization patches
%patch200 -p1 -b .udev
%patch201 -p1 -b .static
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" EXTRAVERSION="%{extraversion}" mdadm mdmon
%install
rm -rf %{buildroot}
@ -118,6 +121,18 @@ rm -rf %{buildroot}
/usr/lib/mdadm/mdadm_env.sh
%changelog
* Thu Feb 24 2022 Xiao Ni <xni@redhat.com> - 4.2-2
- mdadm re-add fault/removed disk failed
- Resolves rhbz#2046323
* Fri Feb 18 2022 Xiao Ni <xni@redhat.com> - 4.2
- Update to 4.2
- Resolves rhbz#2034809
* Mon Nov 08 2021 Xiao Ni <xni@redhat.com> - 4.2-rc3
- Update to 4.2-rc3
- Resolves rhbz#1983019, rhbz#1995582, rhbz#1972032, rhbz#1885665
* Thu Aug 05 2021 Xiao Ni <xni@redhat.com> - 4.2-rc2
- Update to 4.2-rc2
- Resolves rhbz#1989844