summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/mdadm')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch52
-rw-r--r--meta/recipes-extended/mdadm/mdadm_3.2.3.bb (renamed from meta/recipes-extended/mdadm/mdadm_3.2.2.bb)13
2 files changed, 6 insertions, 59 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
deleted file mode 100644
index f573bbcefa..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Upstream-Status: Pending
2
3From 19986c721c9ac4b353c8592998d70d0dc8860bfd Mon Sep 17 00:00:00 2001
4From: Milan Broz <mbroz@redhat.com>
5Date: Thu, 14 Jul 2011 13:58:36 +1000
6Subject: [PATCH] mdadm: fix build failures (ppc64)
7
8This patch fixes these build issues:
9
10super-intel.c: In function 'getinfo_super_imsm_volume':
11super-intel.c:2327:4: error: format '%llu' expects argument of type 'long long
12unsigned int', but argument 3 has type '__u64' [-Werror=format]
13
14super-intel.c: In function 'imsm_reshape_super':
15super-intel.c:8665:7: error: 'devnum' may be used uninitialized in this function [-Werror=uninitialized]
16
17Signed-off-by: Milan Broz <mbroz@redhat.com>
18Signed-off-by: NeilBrown <neilb@suse.de>
19---
20 super-intel.c | 9 ++++++---
21 1 files changed, 6 insertions(+), 3 deletions(-)
22
23diff --git a/super-intel.c b/super-intel.c
24index 5ea3b36..70cf993 100644
25--- a/super-intel.c
26+++ b/super-intel.c
27@@ -2326,7 +2326,9 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
28
29 dprintf("IMSM: General Migration checkpoint : %llu "
30 "(%llu) -> read reshape progress : %llu\n",
31- units, blocks_per_unit, info->reshape_progress);
32+ (unsigned long long)units,
33+ (unsigned long long)blocks_per_unit,
34+ info->reshape_progress);
35
36 used_disks = imsm_num_data_members(dev, 1);
37 if (used_disks > 0) {
38@@ -8661,8 +8663,9 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level,
39 dprintf("imsm: info: Volume operation\n");
40 /* find requested device */
41 while (dev) {
42- imsm_find_array_minor_by_subdev(dev->index, st->container_dev, &devnum);
43- if (devnum == geo.dev_id)
44+ if (imsm_find_array_minor_by_subdev(
45+ dev->index, st->container_dev, &devnum) == 0
46+ && devnum == geo.dev_id)
47 break;
48 dev = dev->next;
49 }
50--
511.7.6.1
52
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.3.bb
index 02109e36ac..17cdd416be 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.3.bb
@@ -2,21 +2,20 @@ DESCRIPTION = " A tool for managing Soft RAID under Linux"
2HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/" 2HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/"
3BUGTRACKER = "n/a" 3BUGTRACKER = "n/a"
4 4
5#A few files are GPLv2+ while most files are GPLv2. 5# Some files are GPLv2+ while others are GPLv2.
6LICENSE = "GPLv2" 6LICENSE = "GPLv2 & GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
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 = "r3" 11PR = "r0"
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 file://mdadm-3.2.2_fix_for_x32.patch \ 14 file://mdadm-3.2.2_fix_for_x32.patch \
16 " 15 "
17 16
18SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651" 17SRC_URI[md5sum] = "d789d6ecb9c1d5ebcc64f0fc52bca92f"
19SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906" 18SRC_URI[sha256sum] = "0ff49a04c6250834ce1b5be5a1581532e70e2221a87e1eedec46d6656b37ab40"
20 19
21CFLAGS += "-fno-strict-aliasing" 20CFLAGS += "-fno-strict-aliasing"
22 21