summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-10-05 17:13:08 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 10:00:10 +0100
commit6d218635e923c1abc39d63cfc19e1632f13d869b (patch)
treeab15aa6b47224b834e1f0a36919434867c3724de
parent3a1fa7dd5982e812a449e5220d64e511821b07df (diff)
downloadpoky-6d218635e923c1abc39d63cfc19e1632f13d869b.tar.gz
Fix mdadm for powerpc64
This takes an upstream fix for compiling on powerpc64 (From OE-Core rev: 1325f506972555d4c218c15090bfa3f63fb13473) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch50
-rw-r--r--meta/recipes-extended/mdadm/mdadm_3.2.2.bb6
2 files changed, 54 insertions, 2 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
new file mode 100644
index 0000000000..931ecbc16d
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
@@ -0,0 +1,50 @@
1From 19986c721c9ac4b353c8592998d70d0dc8860bfd Mon Sep 17 00:00:00 2001
2From: Milan Broz <mbroz@redhat.com>
3Date: Thu, 14 Jul 2011 13:58:36 +1000
4Subject: [PATCH] mdadm: fix build failures (ppc64)
5
6This patch fixes these build issues:
7
8super-intel.c: In function 'getinfo_super_imsm_volume':
9super-intel.c:2327:4: error: format '%llu' expects argument of type 'long long
10unsigned int', but argument 3 has type '__u64' [-Werror=format]
11
12super-intel.c: In function 'imsm_reshape_super':
13super-intel.c:8665:7: error: 'devnum' may be used uninitialized in this function [-Werror=uninitialized]
14
15Signed-off-by: Milan Broz <mbroz@redhat.com>
16Signed-off-by: NeilBrown <neilb@suse.de>
17---
18 super-intel.c | 9 ++++++---
19 1 files changed, 6 insertions(+), 3 deletions(-)
20
21diff --git a/super-intel.c b/super-intel.c
22index 5ea3b36..70cf993 100644
23--- a/super-intel.c
24+++ b/super-intel.c
25@@ -2326,7 +2326,9 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
26
27 dprintf("IMSM: General Migration checkpoint : %llu "
28 "(%llu) -> read reshape progress : %llu\n",
29- units, blocks_per_unit, info->reshape_progress);
30+ (unsigned long long)units,
31+ (unsigned long long)blocks_per_unit,
32+ info->reshape_progress);
33
34 used_disks = imsm_num_data_members(dev, 1);
35 if (used_disks > 0) {
36@@ -8661,8 +8663,9 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level,
37 dprintf("imsm: info: Volume operation\n");
38 /* find requested device */
39 while (dev) {
40- imsm_find_array_minor_by_subdev(dev->index, st->container_dev, &devnum);
41- if (devnum == geo.dev_id)
42+ if (imsm_find_array_minor_by_subdev(
43+ dev->index, st->container_dev, &devnum) == 0
44+ && devnum == geo.dev_id)
45 break;
46 dev = dev->next;
47 }
48--
491.7.6.1
50
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 5d29ae781f..492cc8e6f7 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \ 8 file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161" 9 file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
10 10
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2" 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
14 file://0001-mdadm-fix-build-failures-ppc64.patch \
15 "
14 16
15SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651" 17SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"
16SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906" 18SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906"