mdadm: update to version 3.4
PATCH 1/3 mdadm: update to version 3.4
3.3.4 -> 3.4
a) Removed the following upstreamed patches:
1. mdadm-fix-ptest-build-errors.patch
2. 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
---
.../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 | 50 ------------------
.../mdadm/{mdadm_3.3.4.bb => mdadm_3.4.bb} | 18 ++++---
8 files changed, 194 insertions(+), 118 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
delete mode 100644 meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
rename meta/recipes-extended/mdadm/{mdadm_3.3.4.bb => mdadm_3.4.bb} (74%)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 deleted +0 -50
50 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 -8
@@ -13,12 +13,14 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://gcc-4.9.patch \ 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 +30,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
PATCH 2/3 quota: update to version 4.03
4.02 -> 4.03
a) Added PACKAGECONFIG for ldapmail
b) Added the following backported patches
1. 0001-Fix-build-with-disabled-ldap.patch
2. 0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
c) Removed following patch due to changes in buildsystem
1. config-tcpwrappers.patch
d) Added libnl and dbus in build-deps
---
...dentaly-override-commandline-passed-CFLAG.patch | 33 ++++++++
.../quota/0001-Fix-build-with-disabled-ldap.patch | 93 ++++++++++++++++++++++
.../quota/quota/config-tcpwrappers.patch | 75 -----------------
.../quota/{quota_4.02.bb => quota_4.03.bb} | 23 +++---
4 files changed, 135 insertions(+), 89 deletions(-)
create mode 100644 meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch
create mode 100644 meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch
delete mode 100644 meta/recipes-extended/quota/quota/config-tcpwrappers.patch
rename meta/recipes-extended/quota/{quota_4.02.bb => quota_4.03.bb} (69%)meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> +Date: Mon, 4 Jan 2016 15:48:19 +0100 +Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Signed-off-by: Tomáš Chvátal <[email protected]> +Signed-off-by: Jan Kara <[email protected]> +Signed-off-by: Maxin B. John <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3ba1386..1552c15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ + # ================ + # Check for cflags + # ================ +-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + AC_ARG_ENABLE([werror], + [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], + [enable_werror="$enableval"], +-- +2.4.0 +
meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch new file +93 -0
93 lines not on this page · raw message
meta/recipes-extended/quota/quota/config-tcpwrappers.patch deleted +0 -75
75 lines not on this page · raw message
meta/recipes-extended/quota/quota_4.03.bb renamed from meta/recipes-extended/quota/quota_4.02.bb +9 -14
@@ -8,36 +8,31 @@ LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad2 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ - file://config-tcpwrappers.patch \ + file://0001-Fix-build-with-disabled-ldap.patch \ + file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \ file://fcntl.patch \ file://remove_non_posix_types.patch \ - " + " SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch" -SRC_URI[md5sum] = "a8a5df262261e659716ccad2a5d6df0d" -SRC_URI[sha256sum] = "f4c2f48abf94bbdc396df33d276f2e9d19af58c232cb85eef9c174a747c33795" +SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5" +SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/" UPSTREAM_CHECK_REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/" -S = "${WORKDIR}/quota-tools" - -DEPENDS = "gettext-native e2fsprogs" +DEPENDS = "gettext-native e2fsprogs libnl dbus" inherit autotools-brokensep gettext pkgconfig CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += "-ltirpc" ASNEEDED = "" -EXTRA_OEMAKE += 'STRIP=""' PACKAGECONFIG ??= "tcp-wrappers rpc bsd" PACKAGECONFIG_libc-musl = "tcp-wrappers rpc" -PACKAGECONFIG[tcp-wrappers] = "--with-tcpwrappers,--without-tcpwrappers,tcp-wrappers" -PACKAGECONFIG[rpc] = "--enable-rpc=yes,--enable-rpc=no,libtirpc" +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[rpc] = "--enable-rpc,--disable-rpc,libtirpc" PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no," - -do_install() { - oe_runmake ROOTDIR=${D} install -} +PACKAGECONFIG[ldapmail] = "--enable-ldapmail,--disable-ldapmail,openldap"
Signature · 1 line
2.4.0
PATCH 3/3 iproute2: update to version 4.4.0
In reply to Maxin B. John4.3.0 -> 4.4.0
Added iproute2-fix-building-with-musl.patch to fix build with musl.
---
.../iproute2/iproute2-fix-building-with-musl.patch | 24 ++++++++++++++++++++++
.../{iproute2_4.3.0.bb => iproute2_4.4.0.bb} | 5 +++--
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
rename meta/recipes-connectivity/iproute2/{iproute2_4.3.0.bb => iproute2_4.4.0.bb} (63%)meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch new file +24 -0
@@ -0,0 +1,24 @@ +iproute2: fix building with musl + +We need limits.h for PATH_MAX, fixes: + +rt_names.c:364:13: error: ‘PATH_MAX’ undeclared (first use in this +function) + +Upstream-Status: Backport + +Signed-off-by: Gustavo Zacarias <[email protected]> +Signed-off-by: Maxin B. John <[email protected]> +--- +diff --git a/lib/rt_names.c b/lib/rt_names.c +index f6d17c0..b665d3e 100644 +--- a/lib/rt_names.c ++++ b/lib/rt_names.c +@@ -18,6 +18,7 @@ + #include <sys/time.h> + #include <sys/socket.h> + #include <dirent.h> ++#include <limits.h> + + #include <asm/types.h> + #include <linux/rtnetlink.h>
meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb +3 -2
@@ -4,9 +4,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://configure-cross.patch \ file://0001-iproute2-de-bash-scripts.patch \ file://iproute2-4.3.0-musl.patch \ + file://iproute2-fix-building-with-musl.patch \ " -SRC_URI[md5sum] = "1a2bbb80cfc7ab3f3e987e18b3207c2f" -SRC_URI[sha256sum] = "f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995" +SRC_URI[md5sum] = "d762653ec3e1ab0d4a9689e169ca184f" +SRC_URI[sha256sum] = "bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514" # CFLAGS are computed in Makefile and reference CCOPTS #
Signature · 1 line
2.4.0
Quoted 2 lines · Maxin B. John
3.3.4 -> 3.4
poky builds fail with ptest enabled:
| restripe.c: In function 'test_stripes':
| restripe.c:845:4: error: ignoring return value of 'read', declared with attribute warn_unused_result [-Werror=unused-result]
| read(source[i], stripes[i], chunk_size); | ^ | cc1: all warnings being treated as errors | Makefile:214: recipe for target 'test_stripe' failed
Ross
Hi Ross,
Quoted 5 lines · Ross
Quoted 3 lines · Maxin B. John
3.3.4 -> 3.4poky builds fail with ptest enabled:
Quoted 8 lines
| restripe.c: In function 'test_stripes': | restripe.c:845:4: error: ignoring return value of 'read', declared with attribute warn_unused_result [-Werror=unused-result] | read(source[i], stripes[i], chunk_size); | ^ | cc1: all warnings being treated as errors | Makefile:214: recipe for target 'test_stripe' failedRoss
Will fix it and send a v2 soon.
Best Regards,
Maxin