- fix FTBFS on ppc64 (#1125883)

This commit is contained in:
Dan Horák 2014-08-04 10:34:24 +02:00
parent 2439aace63
commit a4247a8798
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- mdadm-3.3.1/super-ddf.c.ori
+++ mdadm-3.3.1/super-ddf.c
@@ -2847,13 +2847,15 @@ static void _set_config_size(struct phys
__u64 wsp = cfs - t;
if (wsp > 1024*1024*2ULL && wsp > dl->size / 16) {
pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
- __func__, dl->major, dl->minor, wsp);
+ __func__, dl->major, dl->minor,
+ (unsigned long long)wsp);
} else
cfs = t;
}
pde->config_size = cpu_to_be64(cfs);
dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
- __func__, dl->major, dl->minor, cfs, dl->size-cfs);
+ __func__, dl->major, dl->minor,
+ (unsigned long long)cfs, (unsigned long long)(dl->size-cfs));
}
/* Add a device to a container, either while creating it or while

View File

@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 3.3.1
Release: 3%{?dist}
Release: 4%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
Source1: mdmonitor.init
Source2: raid-check
@ -14,6 +14,8 @@ Source8: mdadm_event.conf
Patch1: mdadm-3.3.1-Grow-improve-error-message-is-grow-n2-used-on-Linear.patch
Patch2: mdadm-3.3.1-Assemble-Only-fail-auto-assemble-in-face-of-mdadm.co.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1125883
Patch3: mdadm-3.3.1-format-argument.patch
# Fedora customization patches
Patch97: mdadm-3.3-udev.patch
Patch98: mdadm-2.5.2-static.patch
@ -42,6 +44,7 @@ file can be used to help with some common tasks.
%patch1 -p1 -b .lineargrow
%patch2 -p1 -b .autofail
%patch3 -p1 -b .format
# Fedora customization patches
%patch97 -p1 -b .udev
%patch98 -p1 -b .static
@ -106,6 +109,9 @@ rm -rf %{buildroot}
/etc/libreport/events.d/*
%changelog
* Mon Aug 04 2014 Dan Horák <dan[at]danny.cz> - 3.3.1-4
- fix FTBFS on ppc64 (#1125883)
* Tue Jul 29 2014 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.3.1-3
- Improve error message for "--grow -n2" when used on Linear arrays
- Fix problem where explicitly specified arrays were not assembled if