mdadm: update to version 3.4
PATCH v2 1/1 mdadm: update to version 3.4
3.3.4 -> 3.4
a) Removed the following upstreamed patch:
1. 0001-Define-_POSIX_C_SOURCE-if-undefined.patch
b) Added following patches to fix uclibc,musl and x32 build failures
1. 0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch
2. 0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
3. 0001-Fix-some-type-comparison-problems.patch
4. 0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
Signed-off-by Maxin B. John <[email protected]>
---
.../0001-Define-_POSIX_C_SOURCE-if-undefined.patch | 59 -----------------
.../0001-Fix-some-type-comparison-problems.patch | 50 +++++++++++++++
...th-of-corosync-and-dlm-header-files-check.patch | 33 ++++++++++
...dadm.h-bswap-is-already-defined-in-uclibc.patch | 55 ++++++++++++++++
...il.c-include-poll.h-instead-of-sys-poll.h.patch | 45 +++++++++++++
.../mdadm/files/mdadm-3.2.2_fix_for_x32.patch | 2 +-
.../mdadm/files/mdadm-fix-ptest-build-errors.patch | 75 ++++++++++------------
.../mdadm/{mdadm_3.3.4.bb => mdadm_3.4.bb} | 17 +++--
8 files changed, 229 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/files/0001-Define-_POSIX_C_SOURCE-if-undefined.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-Fix-some-type-comparison-problems.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch
create mode 100644 meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch
rename meta/recipes-extended/mdadm/{mdadm_3.3.4.bb => mdadm_3.4.bb} (75%)meta/recipes-extended/mdadm/files/0001-Define-_POSIX_C_SOURCE-if-undefined.patch deleted +0 -59
@@ -1,59 +0,0 @@ -From d74b02d4653d1ea26029c2528eb93d7268b83eb3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 13 Jan 2016 07:28:33 +0000 -Subject: [PATCH] Define _POSIX_C_SOURCE if undefined - -typecast second argument of connect() API to use struct sockaddr* - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - config.c | 3 +++ - mdmon.c | 2 +- - msg.c | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/config.c b/config.c -index a882ed3..a675688 100644 ---- a/config.c -+++ b/config.c -@@ -63,6 +63,9 @@ - * but may not wrap over lines - * - */ -+#ifndef _POSIX_C_SOURCE -+#define _POSIX_C_SOURCE 200809L -+#endif - - #ifndef CONFFILE - #define CONFFILE "/etc/mdadm.conf" -diff --git a/mdmon.c b/mdmon.c -index ee12b7c..e4b73d9 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -235,7 +235,7 @@ static int make_control_sock(char *devname) - addr.sun_family = PF_LOCAL; - strcpy(addr.sun_path, path); - umask(077); /* ensure no world write access */ -- if (bind(sfd, &addr, sizeof(addr)) < 0) { -+ if (bind(sfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) { - close(sfd); - return -1; - } -diff --git a/msg.c b/msg.c -index 754630b..45cd450 100644 ---- a/msg.c -+++ b/msg.c -@@ -170,7 +170,7 @@ int connect_monitor(char *devname) - - addr.sun_family = PF_LOCAL; - strcpy(addr.sun_path, path); -- if (connect(sfd, &addr, sizeof(addr)) < 0) { -+ if (connect(sfd, (struct sockaddr*)&addr, sizeof(addr)) < 0) { - close(sfd); - return -1; - } --- -2.7.0 -
meta/recipes-extended/mdadm/files/0001-Fix-some-type-comparison-problems.patch new file +50 -0
50 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 1f5baf3ad95ae4c39efe4d8ad8b2e642b3a351da Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <[email protected]> +Date: Tue, 9 Feb 2016 11:44:01 +0200 +Subject: [PATCH] Fix the path of corosync and dlm header files check + +Original Makefile will check headers on host instead of sysroot. +Fix it. + +Upstream-Status: Inappropriate [Yocto specific] + +Signed-off-by: Maxin B. John <[email protected]> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index fd79cfb..34150a9 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,8 +80,8 @@ MDMON_DIR = $(RUN_DIR) + FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots + SYSTEMD_DIR=/lib/systemd/system + +-COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC) +-DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM) ++COROSYNC:=$(shell [ -d $(SYSROOT)/usr/include/corosync ] || echo -DNO_COROSYNC) ++DLM:=$(shell [ -f $(SYSROOT)/usr/include/libdlm.h ] || echo -DNO_DLM) + + DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" + DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" +-- +2.4.0 +
meta/recipes-extended/mdadm/files/0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch new file +55 -0
55 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0001-util.c-include-poll.h-instead-of-sys-poll.h.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: pending +Upstream-Status: Accepted By hardcoding CC's definition in the Makefile, all the gcc parameters set by tune settings are lost. Causing compile failure with x32 toolchain
meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch +35 -40
85 lines not on this page · raw message
meta/recipes-extended/mdadm/mdadm_3.4.bb renamed from meta/recipes-extended/mdadm/mdadm_3.3.4.bb +10 -7
@@ -14,11 +14,14 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://mdadm-3.3.2_x32_abi_time_t.patch \ file://0001-Fix-typo-in-comparision.patch \ file://mdadm-fix-ptest-build-errors.patch \ - file://0001-Define-_POSIX_C_SOURCE-if-undefined.patch \ + file://0001-util.c-include-poll.h-instead-of-sys-poll.h.patch \ + file://0001-mdadm.h-bswap-is-already-defined-in-uclibc.patch \ + file://0001-Fix-some-type-comparison-problems.patch \ + file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "7ca8b114710f98f53f20c5787b674a09" -SRC_URI[sha256sum] = "8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68" +SRC_URI[md5sum] = "04b8b21f637540350f8517c7e68d3c63" +SRC_URI[sha256sum] = "27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808" CFLAGS += "-fno-strict-aliasing" inherit autotools-brokensep
@@ -28,12 +31,12 @@ EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"' # prevents 64-bit userland from seeing this definition, instead defaulting # to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get # int-ll64.h included -EXTRA_OEMAKE_append_powerpc64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE_append_mips64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE_append_mips64n32 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' +CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__' +CFLAGS_append_mips64 = ' -D__SANE_USERSPACE_TYPES__' +CFLAGS_append_mips64n32 = ' -D__SANE_USERSPACE_TYPES__' do_compile() { - oe_runmake + oe_runmake SYSROOT="${STAGING_DIR_TARGET}" } do_install() {
Signature · 1 line
2.4.0