diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | 11 | ||||
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_3.3.bb (renamed from meta/recipes-extended/mdadm/mdadm_3.2.6.bb) | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch index 58d54f9d0c..3b3db0a7f0 100644 --- a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch +++ b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch | |||
| @@ -8,17 +8,16 @@ make file, hence making the CC definition in the Makefile conditional. | |||
| 8 | 8 | ||
| 9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07 | 9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07 |
| 10 | 10 | ||
| 11 | Index: mdadm-3.2.2/Makefile | 11 | Index: mdadm-3.3/Makefile |
| 12 | =================================================================== | 12 | =================================================================== |
| 13 | --- mdadm-3.2.2.orig/Makefile | 13 | --- mdadm-3.3.orig/Makefile 2013-09-03 07:47:47.000000000 +0300 |
| 14 | +++ mdadm-3.2.2/Makefile | 14 | +++ mdadm-3.3/Makefile 2013-10-16 16:44:23.542295487 +0300 |
| 15 | @@ -40,7 +40,8 @@ KLIBC=/home/src/klibc/klibc-0.77 | 15 | @@ -41,7 +41,7 @@ |
| 16 | 16 | ||
| 17 | KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 | 17 | KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 |
| 18 | 18 | ||
| 19 | -CC = $(CROSS_COMPILE)gcc | 19 | -CC = $(CROSS_COMPILE)gcc |
| 20 | +CC ?= $(CROSS_COMPILE)gcc | 20 | +CC ?= $(CROSS_COMPILE)gcc |
| 21 | + | 21 | CXFLAGS ?= -ggdb |
| 22 | CXFLAGS = -ggdb | ||
| 23 | CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter | 22 | CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter |
| 24 | ifdef WARN_UNUSED | 23 | ifdef WARN_UNUSED |
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.6.bb b/meta/recipes-extended/mdadm/mdadm_3.3.bb index 7b6a6c7fe7..23c9408645 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.2.6.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.bb | |||
| @@ -8,14 +8,13 @@ LIC_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 | ||
| 11 | PR = "r0" | ||
| 12 | 11 | ||
| 13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ | 12 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ |
| 14 | file://mdadm-3.2.2_fix_for_x32.patch \ | 13 | file://mdadm-3.2.2_fix_for_x32.patch \ |
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | SRC_URI[md5sum] = "3e255dc71e5144bbcb872788ca647267" | 16 | SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57" |
| 18 | SRC_URI[sha256sum] = "c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38" | 17 | SRC_URI[sha256sum] = "9c07e518bdf3392ebac8874eb686258e10ea3ae0ff7a8acb6d014718a9c3ed45" |
| 19 | 18 | ||
| 20 | CFLAGS += "-fno-strict-aliasing" | 19 | CFLAGS += "-fno-strict-aliasing" |
| 21 | 20 | ||