[mdadm] Upgrade to mdadm-3.2.4
Jes Sorensen
jsorensen at fedoraproject.org
Thu May 10 11:10:31 UTC 2012
commit 76ff773cd6237047d2d5ea11fb6224bea12e89d0
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date: Thu May 10 13:08:42 2012 +0200
Upgrade to mdadm-3.2.4
Resolves: bz820534 (rawhide) bz820527 (f17) bz820531 (f16) bz820532 (f15)
Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>
mdadm-2.5.2-static.patch | 16 -
mdadm-3.2.3-Add-offroot-argument-to-mdadm.patch | 101 ----
mdadm-3.2.3-Add-offroot-argument-to-mdmon.patch | 79 ---
mdadm-3.2.3-Bitmap_offset-is-a-signed-number.patch | 66 ---
...is-not-run-when-expansion-disks-are-added.patch | 30 --
...ed-second-array-is-in-read-only-state-dur.patch | 85 ----
...-in-0-case-for-reshape-position-verificat.patch | 63 ---
....3-FIX-Detect-error-and-rollback-metadata.patch | 62 ---
...try-to-continue-reshape-using-inactive-ar.patch | 50 --
mdadm-3.2.3-FIX-Extend-size-of-raid0-array.patch | 84 ----
...xternal-metadata-sometimes-is-not-updated.patch | 35 --
...-FIX-NULL-pointer-to-strdup-can-be-passed.patch | 38 --
...2.3-FIX-Respect-metadata-size-limitations.patch | 50 --
...ange-is-possible-as-standalone-change-onl.patch | 30 --
...2.3-FIX-Support-metadata-changes-rollback.patch | 118 -----
...heck-in-reshape_container-can-cause-a-pro.patch | 39 --
...-reshape-when-reshape-process-is-stopped-.patch | 45 --
....3-FIX-use-md-position-to-reshape-restart.patch | 139 ------
...mes-mdmon-throws-core-dump-during-reshape.patch | 46 --
...gn-extension-of-bitmap_offset-in-super1.c.patch | 40 --
...-before-next-reshape-step-during-containe.patch | 96 ----
...ental-fix-adding-devices-with-incremental.patch | 49 --
...ysfs_set_num_signed-and-use-it-to-set-bit.patch | 68 ---
...3.2.3-Manage-allow-re-add-to-failed-array.patch | 66 ---
...ze-recovery-while-adding-multiple-devices.patch | 66 ---
...3-Manage-replace-return-1-with-goto-abort.patch | 347 --------------
...-message-if-failing-to-write-super-for-1..patch | 94 ----
...d-limit-of-1024-when-scanning-for-devices.patch | 81 ----
...lax-restrictions-on-when-add-is-permitted.patch | 85 ----
...-3.2.3-Remove-avail_disks-arg-from-enough.patch | 171 -------
mdadm-3.2.3-Reset-bad-flag-on-map-update.patch | 32 --
...-with-offroot-if-mdadm-was-launched-with-.patch | 75 ---
...k-around-gcc-4.7-s-strict-aliasing-checks.patch | 122 -----
...e-free-upon-old-buggy-kernel-sysfs_read-f.patch | 31 --
...no-disk-over-2TB-is-used-to-create-contai.patch | 52 --
...olume-size-in-validate_geometry_imsm_orom.patch | 69 ---
...ts-if-not-used-after-loading-metadata-fro.patch | 72 ---
mdadm-3.2.3-fix-Monitor-sometimes-crashes.patch | 34 --
...-container-creation-with-incremental-used.patch | 34 --
...fix-correct-extending-size-of-raid0-array.patch | 31 --
....2.3-imsm-Add-function-imsm_get_free_size.patch | 63 ---
...w-metadata-update-for-volume-size-expansi.patch | 238 ----------
...xecute-size-change-for-external-metatdata.patch | 129 -----
...d-volume-size-expand-support-to-imsm_anal.patch | 103 ----
...2.3-imsm-FIX-Chunk-size-migration-problem.patch | 32 --
...ear-migration-record-when-migration-switc.patch | 88 ----
...3-imsm-FIX-Component-size-alignment-check.patch | 126 -----
...-new-missing-disks-are-allowed-during-gen.patch | 44 --
...msm-FIX-Support-metadata-changes-rollback.patch | 130 -----
...date-function-imsm_num_data_members-for-R.patch | 36 --
...sm_get_allowed_degradation-doesn-t-count-.patch | 29 --
...sm-FIX-use-md-position-to-reshape-restart.patch | 43 --
...t-setting-max-size-for-size-change-operat.patch | 60 ---
...3-imsm-avoid-overflows-for-disks-over-1TB.patch | 484 -------------------
...y-fd-in-error-trace-when-when-store_imsm_.patch | 31 --
...y-maximum-volumes-per-controller-in-detai.patch | 29 --
...ix-rebuild-does-not-continue-after-reboot.patch | 62 ---
...e-second-array-need-to-have-the-whole-ava.patch | 40 --
...sm-fix-thunderdome-may-drop-2tb-attribute.patch | 33 --
...msm_super_all-supports-loading-metadata-f.patch | 157 ------
...-load_super_imsm_all-function-refactoring.patch | 261 ----------
...2.3-imsm-set-2tb-disk-attribute-for-spare.patch | 30 --
...te-the-number-of-imsm-volumes-per-control.patch | 497 --------------------
...getopt_long-to-parse-command-line-options.patch | 97 ----
...or-ensure-we-retry-soon-when-remove-fails.patch | 92 ----
...ke-return-from-read_and_act-more-symbolic.patch | 109 -----
...-volumes-disks-support-in-detail-platform.patch | 39 --
...m-3.2.3-simplify-calculating-array_blocks.patch | 47 --
...-aread-awrite-always-use-an-aligned-buffe.patch | 88 ----
mdadm-3.2.4-map-dir.patch | 18 +
mdadm.spec | 161 +------
71 files changed, 35 insertions(+), 6252 deletions(-)
---
diff --git a/mdadm-2.5.2-static.patch b/mdadm-2.5.2-static.patch
index 6ce9bd7..1eb335a 100644
--- a/mdadm-2.5.2-static.patch
+++ b/mdadm-2.5.2-static.patch
@@ -1,21 +1,5 @@
--- mdadm-3.2.1/Makefile.static 2011-03-27 22:31:20.000000000 -0400
+++ mdadm-3.2.1/Makefile 2011-03-28 10:16:55.277900184 -0400
-@@ -68,11 +68,11 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
- # pivotroot from early boot to late boot.
- # /dev is an odd place to put this, but it is the only directory that
- # meets the requirements.
--MAP_DIR=/dev/.mdadm
--MAP_FILE = map
--MDMON_DIR = /dev/.mdadm
-+MAP_DIR=/dev/md
-+MAP_FILE = md-device-map
-+MDMON_DIR = /dev/md
- # place for autoreplace cookies
--FAILED_SLOTS_DIR = /dev/.mdadm/failed-slots
-+FAILED_SLOTS_DIR = /dev/md/failed-slots
- DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
- DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
- DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
@@ -238,16 +238,16 @@ install : mdadm mdmon install-man instal
$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
diff --git a/mdadm-3.2.4-map-dir.patch b/mdadm-3.2.4-map-dir.patch
new file mode 100644
index 0000000..f1e9865
--- /dev/null
+++ b/mdadm-3.2.4-map-dir.patch
@@ -0,0 +1,18 @@
+--- mdadm-3.2.4/Makefile.map-dir 2012-05-10 12:29:09.687578525 +0200
++++ mdadm-3.2.4/Makefile 2012-05-10 12:28:05.514380800 +0200
+@@ -67,12 +67,12 @@
+ # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
+ # pivotroot from early boot to late boot.
+ # /run is best, but for distros that don't support that, /dev can work.
+-MAP_DIR=/run/mdadm
+-MAP_FILE = map
++MAP_DIR=/dev/md
++MAP_FILE = md-device-map
+ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
+ MDMON_DIR = $(MAP_DIR)
+ # place for autoreplace cookies
+-FAILED_SLOTS_DIR = /run/mdadm/failed-slots
++FAILED_SLOTS_DIR = $(MDMON_DIR)/failed-slots
+ DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
+ DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
+ DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
diff --git a/mdadm.spec b/mdadm.spec
index a5a4792..0b74d26 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,8 +1,8 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
-Version: 3.2.3
-Release: 9%{?dist}
-Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
+Version: 3.2.4
+Release: 1%{?dist}
+Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
Source1: mdmonitor.init
Source2: raid-check
Source3: mdadm.rules
@@ -11,78 +11,11 @@ Source5: mdadm-cron
Source6: mdmonitor.service
Source7: mdmonitor-takeover.service
Source8: mdadm.conf
-Patch1: mdadm-3.2.3-Work-around-gcc-4.7-s-strict-aliasing-checks.patch
-Patch2: mdadm-3.2.3-monitor-make-return-from-read_and_act-more-symbolic.patch
-Patch3: mdadm-3.2.3-monitor-ensure-we-retry-soon-when-remove-fails.patch
-Patch4: mdadm-3.2.3-mdmon-Use-getopt_long-to-parse-command-line-options.patch
-Patch5: mdadm-3.2.3-Add-offroot-argument-to-mdadm.patch
-Patch6: mdadm-3.2.3-Add-offroot-argument-to-mdmon.patch
-Patch7: mdadm-3.2.3-Spawn-mdmon-with-offroot-if-mdadm-was-launched-with-.patch
-Patch8: mdadm-3.2.3-super1-make-aread-awrite-always-use-an-aligned-buffe.patch
-Patch9: mdadm-3.2.3-avoid-double-free-upon-old-buggy-kernel-sysfs_read-f.patch
-Patch10: mdadm-3.2.3-Print-error-message-if-failing-to-write-super-for-1..patch
-Patch11: mdadm-3.2.3-Incremental-fix-adding-devices-with-incremental.patch
-Patch12: mdadm-3.2.3-FIX-External-metadata-sometimes-is-not-updated.patch
-Patch13: mdadm-3.2.3-FIX-mdmon-check-in-reshape_container-can-cause-a-pro.patch
-Patch14: mdadm-3.2.3-imsm-display-fd-in-error-trace-when-when-store_imsm_.patch
-Patch15: mdadm-3.2.3-FIX-NULL-pointer-to-strdup-can-be-passed.patch
-Patch16: mdadm-3.2.3-imsm-FIX-No-new-missing-disks-are-allowed-during-gen.patch
-Patch17: mdadm-3.2.3-FIX-Array-is-not-run-when-expansion-disks-are-added.patch
-Patch18: mdadm-3.2.3-imsm-FIX-imsm_get_allowed_degradation-doesn-t-count-.patch
-Patch19: mdadm-3.2.3-Fix-Sometimes-mdmon-throws-core-dump-during-reshape.patch
-Patch20: mdadm-3.2.3-Flush-mdmon-before-next-reshape-step-during-containe.patch
-Patch21: mdadm-3.2.3-imsm-FIX-Chunk-size-migration-problem.patch
-Patch22: mdadm-3.2.3-FIX-use-md-position-to-reshape-restart.patch
-Patch23: mdadm-3.2.3-imsm-FIX-use-md-position-to-reshape-restart.patch
-Patch24: mdadm-3.2.3-imsm-FIX-Clear-migration-record-when-migration-switc.patch
-Patch25: mdadm-3.2.3-FIX-restart-reshape-when-reshape-process-is-stopped-.patch
-Patch26: mdadm-3.2.3-FIX-Do-not-try-to-continue-reshape-using-inactive-ar.patch
-Patch27: mdadm-3.2.3-FIX-Changes-in-0-case-for-reshape-position-verificat.patch
-Patch28: mdadm-3.2.3-fix-Monitor-sometimes-crashes.patch
-Patch29: mdadm-3.2.3-fix-container-creation-with-incremental-used.patch
-Patch30: mdadm-3.2.3-imsm-fix-the-second-array-need-to-have-the-whole-ava.patch
-Patch31: mdadm-3.2.3-imsm-load_super_imsm_all-function-refactoring.patch
-Patch32: mdadm-3.2.3-imsm-load_imsm_super_all-supports-loading-metadata-f.patch
-Patch33: mdadm-3.2.3-imsm-validate-the-number-of-imsm-volumes-per-control.patch
-Patch34: mdadm-3.2.3-imsm-display-maximum-volumes-per-controller-in-detai.patch
-Patch35: mdadm-3.2.3-imsm-avoid-overflows-for-disks-over-1TB.patch
-Patch36: mdadm-3.2.3-clear-hi-bits-if-not-used-after-loading-metadata-fro.patch
-Patch37: mdadm-3.2.3-simplify-calculating-array_blocks.patch
-Patch38: mdadm-3.2.3-show-2TB-volumes-disks-support-in-detail-platform.patch
-Patch39: mdadm-3.2.3-check-volume-size-in-validate_geometry_imsm_orom.patch
-Patch40: mdadm-3.2.3-check-that-no-disk-over-2TB-is-used-to-create-contai.patch
-Patch41: mdadm-3.2.3-imsm-set-2tb-disk-attribute-for-spare.patch
-Patch42: mdadm-3.2.3-imsm-fix-thunderdome-may-drop-2tb-attribute.patch
-Patch43: mdadm-3.2.3-imsm-FIX-Update-function-imsm_num_data_members-for-R.patch
-Patch44: mdadm-3.2.3-imsm-FIX-Add-volume-size-expand-support-to-imsm_anal.patch
-Patch45: mdadm-3.2.3-imsm-Add-new-metadata-update-for-volume-size-expansi.patch
-Patch46: mdadm-3.2.3-imsm-Execute-size-change-for-external-metatdata.patch
-Patch47: mdadm-3.2.3-FIX-Support-metadata-changes-rollback.patch
-Patch48: mdadm-3.2.3-imsm-FIX-Support-metadata-changes-rollback.patch
-Patch49: mdadm-3.2.3-FIX-Extend-size-of-raid0-array.patch
-Patch50: mdadm-3.2.3-FIX-Respect-metadata-size-limitations.patch
-Patch51: mdadm-3.2.3-FIX-Detect-error-and-rollback-metadata.patch
-Patch52: mdadm-3.2.3-imsm-Add-function-imsm_get_free_size.patch
-Patch53: mdadm-3.2.3-imsm-Support-setting-max-size-for-size-change-operat.patch
-Patch54: mdadm-3.2.3-imsm-FIX-Component-size-alignment-check.patch
-Patch55: mdadm-3.2.3-FIX-Size-change-is-possible-as-standalone-change-onl.patch
-Patch56: mdadm-3.2.3-FIX-Assembled-second-array-is-in-read-only-state-dur.patch
-Patch57: mdadm-3.2.3-fix-correct-extending-size-of-raid0-array.patch
-Patch58: mdadm-3.2.3-imsm-fix-rebuild-does-not-continue-after-reboot.patch
-Patch59: mdadm-3.2.3-Manage-allow-re-add-to-failed-array.patch
-Patch60: mdadm-3.2.3-Manage-replace-return-1-with-goto-abort.patch
-Patch61: mdadm-3.2.3-Manage-freeze-recovery-while-adding-multiple-devices.patch
-Patch62: mdadm-3.2.3-Relax-restrictions-on-when-add-is-permitted.patch
-Patch63: mdadm-3.2.3-Raid-limit-of-1024-when-scanning-for-devices.patch
-Patch64: mdadm-3.2.3-Remove-avail_disks-arg-from-enough.patch
-Patch65: mdadm-3.2.3-Reset-bad-flag-on-map-update.patch
-Patch66: mdadm-3.2.3-Bitmap_offset-is-a-signed-number.patch
-Patch67: mdadm-3.2.3-Fix-sign-extension-of-bitmap_offset-in-super1.c.patch
-Patch68: mdadm-3.2.3-Introduce-sysfs_set_num_signed-and-use-it-to-set-bit.patch
-
# Fedora customization patches
-Patch98: mdadm-3.2.3-udev.patch
-Patch99: mdadm-2.5.2-static.patch
+Patch97: mdadm-3.2.3-udev.patch
+Patch98: mdadm-2.5.2-static.patch
+# Fedora 15, 16, 17 - only
+Patch99: mdadm-3.2.4-map-dir.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
Group: System Environment/Base
@@ -115,78 +48,14 @@ is not used as the system init process.
%prep
%setup -q
-%patch1 -p1 -b .gcc47
-%patch2 -p1 -b .read
-%patch3 -p1 -b .retry
-%patch4 -p1 -b .getopt
-%patch5 -p1 -b .offroot-mdadm
-%patch6 -p1 -b .offroot-mdmon
-%patch7 -p1 -b .offroot-spawn
-%patch8 -p1 -b .bitmap
-%patch9 -p1 -b .double
-%patch10 -p1 -b .print
-%patch11 -p1 -b .incremental
-%patch12 -p1 -b .update
-%patch13 -p1 -b .mdmon
-%patch14 -p1 -b .display
-%patch15 -p1 -b .strdup
-%patch16 -p1 -b .missing
-%patch17 -p1 -b .exp
-%patch18 -p1 -b .allowed
-%patch19 -p1 -b .core
-%patch20 -p1 -b .flush
-%patch21 -p1 -b .chunk
-%patch22 -p1 -b .position
-%patch23 -p1 -b .reshape
-%patch24 -p1 -b .record
-%patch25 -p1 -b .restart
-%patch26 -p1 -b .nocontinue
-%patch27 -p1 -b .0case
-%patch28 -p1 -b .monitor3
-%patch29 -p1 -b .container
-%patch30 -p1 -b .available
-%patch31 -p1 -b .validate-1
-%patch32 -p1 -b .validate-2
-%patch33 -p1 -b .validate-3
-%patch34 -p1 -b .validate-4
-%patch35 -p1 -b .2tb-1
-%patch36 -p1 -b .2tb-2
-%patch37 -p1 -b .2tb-3
-%patch38 -p1 -b .2tb-4
-%patch39 -p1 -b .2tb-5
-%patch40 -p1 -b .2tb-6
-%patch41 -p1 -b .2tb-7
-%patch42 -p1 -b .2tb-8
-%patch43 -p1 -b .expand-01
-%patch44 -p1 -b .expand-02
-%patch45 -p1 -b .expand-03
-%patch46 -p1 -b .expand-04
-%patch47 -p1 -b .expand-05
-%patch48 -p1 -b .expand-06
-%patch49 -p1 -b .expand-07
-%patch50 -p1 -b .expand-08
-%patch51 -p1 -b .expand-09
-%patch52 -p1 -b .expand-10
-%patch53 -p1 -b .expand-11
-%patch54 -p1 -b .expand-12
-%patch55 -p1 -b .expand-13
-%patch56 -p1 -b .expand-14
-%patch57 -p1 -b .expand-15
-%patch58 -p1 -b .rebuild-continue
-%patch59 -p1 -b .allow-re-add
-%patch60 -p1 -b .replace-return-1
-%patch61 -p1 -b .freeze-recovery
-%patch62 -p1 -b .make-add-work
-%patch63 -p1 -b .max-devices
-%patch64 -p1 -b .enough
-%patch65 -p1 -b .bad-flag
-%patch66 -p1 -b .bitmap-offset
-%patch67 -p1 -b .bitmap-offset2
-%patch68 -p1 -b .bitmap-offset3
# Fedora customization patches
-%patch98 -p1 -b .udev
-%patch99 -p1 -b .static
+%patch97 -p1 -b .udev
+%patch98 -p1 -b .static
+# Fedora 15, 16, 17 - only
+%if "%{fedora}" <= "17"
+%patch99 -p1 -b .map-dir
+%endif
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
@@ -259,6 +128,10 @@ fi
%{_initrddir}/*
%changelog
+* Thu May 10 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-1
+- Upgrade to mdadm-3.2.4
+- Resolves bz820534 (rawhide) bz820527 (f17) bz820531 (f16) bz820532 (f15)
+
* Mon Apr 30 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-9
- Fix Monitor mode sometimes crashes when a resync completes
- Fix missing symlink for mdadm container device when incremental creates
More information about the scm-commits
mailing list