From patchwork Fri Sep 8 18:29:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 112129 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp665902qgf; Fri, 8 Sep 2017 11:29:34 -0700 (PDT) X-Received: by 10.84.247.23 with SMTP id n23mr4572315pll.318.1504895374809; Fri, 08 Sep 2017 11:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504895374; cv=none; d=google.com; s=arc-20160816; b=pDcjnlkly8gNwZRh+XPunB0ia5Ya0/TtDW8h62YPac0Kg2mY8TmXcStP6XNK8M6W05 HWj5UQ1vCra1wrhBPNxsqHNr+a66/MAPUiSJ1l9p+idHCfvS1lIEkc3qyV4o9QyIcnGM wJLyJtTrB+N2Mic2CPRUET7jLHAlj7W8N4VsPHveEufFpKjNCDVOz1ilcaDnmDOI+nLz BA520yFEqOf518C8UKjJBJJPm2gUVbfNaxyIfJljSc2DUsv1/EsZD8leArClMc7P6w1L 0Z0loi6bd3GDlTCzqvdolJSaWsl9tvG5X6Dn2Zx+vp3Rt7xem+G9wsJvqQg0Gcu4egYS ENQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=o//wzvbwo26RzHsrf4F8jdknk+IQRNs7ItUUvgi08zk=; b=TzViKdmySsA7pMvy4w5/5pz0pKMOFO/FFL0Kj3hpxp3nEx3t9QQJhlLsJJ2YoxhD6T /3Z4pVbFT2DQuCfTfHHMHqm39eodZotRhk/OuVvkFM0WET5baJ+2jF9ZHCi0inraISUJ oBHfwM11jamN7uYwx+PqBiJyA0TSlCyL2WchRSmjAn7XxYlipzbgGN59HLTNKFDbifKM UV4NeKmiRUjp+ts7xh56JErszD2tf9Of3BUP0cjV0Tts6jaNwSGPZ+HlvQ3dM46tH9I2 sJyWceU8bew7fz4erw0ngMeDCmMnf1XZ39iSrmlbxaeR1Owl8WZ/9U5M8NUB7iJe/IHM SFVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hE89mnES; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k1si1857635pgo.378.2017.09.08.11.29.33; Fri, 08 Sep 2017 11:29:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hE89mnES; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7D2B47822A; Fri, 8 Sep 2017 18:29:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 0CEB17757F for ; Fri, 8 Sep 2017 18:29:25 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id g65so1549575pfe.1 for ; Fri, 08 Sep 2017 11:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gfcqRp7CXW38zq8gp0bk2VasCJR8Vk//ijydrZ9ejlc=; b=hE89mnES/PkJxf6yWtkGEUmCmMjYElHD4FIPEyCTjdhJ9GJKa8m8Lpq15ycIxw7cWz yNXQL/h3uTBwuNzi88Ib3D7lPGXWx/cFW1WNohn6IE2OOCHw5IPTY6CvxJ4OundWCn1k XBbvwkA0Pl2i50RdUj9oPJvgPyyTaFKmfQOPi+j9AYS0z4jhOXkTSPZedtC2uoFdvpym T7jwgCIiQwgHGwgPIy7MXmSG3tNvOMgZlAO8AWFDfBMiy0CKNofZfn2nM6RfbuHgPqff A2fH7B0z8sA9wky9csUNLOxKhRay4oPaEWGXxejqleYAJu3Qc6p9psig+DsKtzRDeTq3 wj2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gfcqRp7CXW38zq8gp0bk2VasCJR8Vk//ijydrZ9ejlc=; b=hXTaf3xW4HGTJdx2Rbc1V4EKsBmWk71ku5Q0324+0Bgc7OzpqYCDu4B81EjUVRpLIg 30ushHgYvf+zto1ohZY7H383DJPfUK5rRTr+qZc1xudIa3AOZXuhbyKsua6SqoZ953YU kYnf8Ymupb+omVIBNfEjdk5B1z0EJp7fnbSPAbOB8oAcXJ64wZIe3AVrcqHfMuJ+Uz2r dIX556OzQW4efethXqdI0u0lXmL0pc0xnc/nk1DfF2aZco0kxXDgNbW1Z6IBdUrsfQ5J LR4edONsygz0EdBF26sKAD2hq0frHDJQz3kS+OtIza9l62nzWBpfXHSahbv9NtXumHQS qj8A== X-Gm-Message-State: AHPjjUhw6Rk6i+wTR2yFbnqlPzOCDeuaGCghgxxz/78HE0NkzQ5xY8dC rXK85Neos8EgZxVo X-Google-Smtp-Source: ADKCNb5qE1EEsaHnJ182PZ0BTuUACnfbpaxqvDZY9AL+CnLg2niY+DpE8J1rHcLwlgw5ib8WbWqbnQ== X-Received: by 10.84.210.35 with SMTP id z32mr4504281plh.345.1504895366691; Fri, 08 Sep 2017 11:29:26 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id m5sm4993977pfh.35.2017.09.08.11.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 11:29:25 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 8 Sep 2017 11:29:17 -0700 Message-Id: <20170908182918.39345-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [oe] [meta-networking][PATCH 1/2] yp-tools: Upgrade to 4.2.2 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with musl along the way drop upstreamed patches as well as ones not required anymore Signed-off-by: Khem Raj --- ...01-lib-yp_all_host.c-Fix-build-with-gcc-7.patch | 33 ------- ...ding_dup.c-Include-string.h-for-strdup-de.patch | 28 ++++++ ...mp_bindings.c-Include-string.h-for-memset.patch | 30 ++++++ .../nis/yp-tools/alignment-cheat.patch | 52 ---------- ...rovide-an-in-place-version-of-mapv4v6addr.patch | 110 --------------------- .../nis/{yp-tools_3.3.bb => yp-tools_4.2.2.bb} | 16 ++- 6 files changed, 65 insertions(+), 204 deletions(-) delete mode 100644 meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch create mode 100644 meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch create mode 100644 meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch delete mode 100644 meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch delete mode 100644 meta-networking/recipes-support/nis/yp-tools/yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch rename meta-networking/recipes-support/nis/{yp-tools_3.3.bb => yp-tools_4.2.2.bb} (69%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch b/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch deleted file mode 100644 index d1d5f9ca7..000000000 --- a/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71fdfdfcea2bfa5f522512366bfcdf95f861ecc6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 23 Apr 2017 23:44:37 -0700 -Subject: [PATCH] lib/yp_all_host.c: Fix build with gcc 7 - -fixes - -| ../../../../../../../workspace/sources/yp-tools/lib/yp_all_host.c: In function 'yp_all_host': -| ../../../../../../../workspace/sources/yp-tools/lib/yp_all_host.c:109:30: error: comparison between pointer and zero character constant [-Werror=pointer-compare] -| inmap == NULL || inmap == '\0') -| ^~ - -Signed-off-by: Khem Raj ---- - lib/yp_all_host.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/yp_all_host.c b/lib/yp_all_host.c -index 59cf236..4a07a7e 100644 ---- a/lib/yp_all_host.c -+++ b/lib/yp_all_host.c -@@ -106,7 +106,7 @@ yp_all_host (const char *indomain, const char *inmap, - - if (hostname == NULL || hostname[0] == '\0' || - indomain == NULL || indomain[0] == '\0' || -- inmap == NULL || inmap == '\0') -+ inmap == NULL || inmap[0] == '\0') - return YPERR_BADARGS; - - res = YPERR_YPERR; --- -2.12.2 - diff --git a/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch b/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch new file mode 100644 index 000000000..3d4d4f278 --- /dev/null +++ b/meta-networking/recipes-support/nis/yp-tools/0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch @@ -0,0 +1,28 @@ +From 420cb6927553bbca5b49b7681cf208e6df6e4d7c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Sep 2017 08:42:45 -0700 +Subject: [PATCH 1/2] ypbind3_binding_dup.c: Include string.h for strdup + declaration + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + lib/ypbind3_binding_dup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/ypbind3_binding_dup.c b/lib/ypbind3_binding_dup.c +index ce4aadf..8199c0b 100644 +--- a/lib/ypbind3_binding_dup.c ++++ b/lib/ypbind3_binding_dup.c +@@ -19,6 +19,7 @@ + + #if defined(HAVE_YPBIND3) + ++#include + #include + #include "internal.h" + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch b/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch new file mode 100644 index 000000000..0562e58af --- /dev/null +++ b/meta-networking/recipes-support/nis/yp-tools/0002-yp_dump_bindings.c-Include-string.h-for-memset.patch @@ -0,0 +1,30 @@ +From 03ccabb6264c008430c4b1739351df5a63829f8e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 8 Sep 2017 08:52:32 -0700 +Subject: [PATCH 2/2] yp_dump_bindings.c: Include string.h for memset + +Fixes +error: implicitly declaring library function 'memset' + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + src/yp_dump_binding.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/yp_dump_binding.c b/src/yp_dump_binding.c +index a5ab920..d75e2c2 100644 +--- a/src/yp_dump_binding.c ++++ b/src/yp_dump_binding.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.14.1 + diff --git a/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch b/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch deleted file mode 100644 index be9b62b8c..000000000 --- a/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch +++ /dev/null @@ -1,52 +0,0 @@ -yp-tools: avoid fatal cast warning - -The way casting is done, we will get a fatal alignment warning on some -architectures. This patch cheats our way around this. - -We also eliminate an unused constant which causes a fatal warning. - -Upstream-status: Inappropriate [code does not exist in version 4.x] - -Signed-off-by: Joe Slater - ---- a/lib/do_ypcall.c -+++ b/lib/do_ypcall.c -@@ -44,7 +44,6 @@ struct dom_binding - typedef struct dom_binding dom_binding; - - static const struct timeval RPCTIMEOUT = {25, 0}; --static const struct timeval UDPTIMEOUT = {5, 0}; - static int const MAXTRIES = 2; - static pthread_mutex_t ypbindlist_lock = PTHREAD_MUTEX_INITIALIZER; - static dom_binding *ypbindlist = NULL; -@@ -381,7 +380,7 @@ __ypclnt_call (u_long prog, xdrproc_t xa - - int - do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, -- caddr_t req, xdrproc_t xres, caddr_t resp) -+ caddr_t req, xdrproc_t xres, void *resp) - { - dom_binding *ydb; - int status; -@@ -450,7 +449,7 @@ do_ypcall (const char *domain, u_long pr - /* Like do_ypcall, but translate the status value if necessary. */ - int - do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, -- caddr_t req, xdrproc_t xres, caddr_t resp) -+ caddr_t req, xdrproc_t xres, void *resp) - { - int status = do_ypcall (domain, prog, xargs, req, xres, resp); - if (status == YPERR_SUCCESS) ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -17,8 +17,8 @@ - #define _INTERNAL_H_ - - extern int do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, -- caddr_t req, xdrproc_t xres, caddr_t resp); -+ caddr_t req, xdrproc_t xres, void *resp); - extern int do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, -- caddr_t req, xdrproc_t xres, caddr_t resp); -+ caddr_t req, xdrproc_t xres, void *resp); - extern int yp_maplist (const char *, struct ypmaplist **); - #endif diff --git a/meta-networking/recipes-support/nis/yp-tools/yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch b/meta-networking/recipes-support/nis/yp-tools/yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch deleted file mode 100644 index 9ef569f15..000000000 --- a/meta-networking/recipes-support/nis/yp-tools/yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch +++ /dev/null @@ -1,110 +0,0 @@ -From a1ef10d63b0ea34c788d5432e94c72b00ae55e04 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald -Date: Fri, 27 Feb 2015 12:04:10 -0500 -Subject: [PATCH] ipv4/ipv6: Provide an in-place version of mapv4v6addr.h - -mapv4v6addr.h isn't always available, depending on your build, but -nis-hosts.c only needs it for a single, inline function. So drop a copy -here rather than playing games with the include path that would -potentially lead to cross-compilation issues. - -Upstream-status: Inappropriate [embedded specific] - -Signed-off-by: Joe MacDonald ---- - nss_nis6/mapv4v6addr.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ - nss_nis6/nis-hosts.c | 2 +- - 2 files changed, 70 insertions(+), 1 deletion(-) - create mode 100644 nss_nis6/mapv4v6addr.h - -diff --git a/nss_nis6/mapv4v6addr.h b/nss_nis6/mapv4v6addr.h -new file mode 100644 -index 0000000..7f85f7d ---- /dev/null -+++ b/nss_nis6/mapv4v6addr.h -@@ -0,0 +1,69 @@ -+/* -+ * ++Copyright++ 1985, 1988, 1993 -+ * - -+ * Copyright (c) 1985, 1988, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * - -+ * Portions Copyright (c) 1993 by Digital Equipment Corporation. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies, and that -+ * the name of Digital Equipment Corporation not be used in advertising or -+ * publicity pertaining to distribution of the document or software without -+ * specific, written prior permission. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ * - -+ * --Copyright-- -+ */ -+ -+#include -+#include -+ -+static void -+map_v4v6_address (const char *src, char *dst) -+{ -+ u_char *p = (u_char *) dst; -+ int i; -+ -+ /* Move the IPv4 part to the right position. */ -+ memcpy (dst + 12, src, INADDRSZ); -+ -+ /* Mark this ipv6 addr as a mapped ipv4. */ -+ for (i = 0; i < 10; i++) -+ *p++ = 0x00; -+ *p++ = 0xff; -+ *p = 0xff; -+} -diff --git a/nss_nis6/nis-hosts.c b/nss_nis6/nis-hosts.c -index af99c74..96d8fa1 100644 ---- a/nss_nis6/nis-hosts.c -+++ b/nss_nis6/nis-hosts.c -@@ -36,7 +36,7 @@ - #include "nss-nis6.h" - - /* Get implementation for some internal functions. */ --#include -+#include "mapv4v6addr.h" - - #define ENTNAME hostent - #define DATABASE "hosts" --- -1.9.1 - diff --git a/meta-networking/recipes-support/nis/yp-tools_3.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb similarity index 69% rename from meta-networking/recipes-support/nis/yp-tools_3.3.bb rename to meta-networking/recipes-support/nis/yp-tools_4.2.2.bb index 7bd4630f7..a3f0a7698 100644 --- a/meta-networking/recipes-support/nis/yp-tools_3.3.bb +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb @@ -13,14 +13,13 @@ and ypdomainname. \ SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ file://domainname.service \ - file://yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch \ - file://alignment-cheat.patch \ - file://0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch \ + file://0001-ypbind3_binding_dup.c-Include-string.h-for-strdup-de.patch \ + file://0002-yp_dump_bindings.c-Include-string.h-for-memset.patch \ " -SRC_URI[md5sum] = "acebeecc11a73fb8097503670344834c" -SRC_URI[sha256sum] = "812be817df3d4c25813552be336c6c6ad5aedaf65611b81af3ad9f98fb3c2e50" +SRC_URI[md5sum] = "fb4a8bffb44ae5d3390351d67f320ef3" +SRC_URI[sha256sum] = "137f19a986382b275bf4a2b1a69eb26689d6f4ac056ddaa21784d6b80eb98faa" -DEPENDS = "libtirpc" +DEPENDS = "libtirpc libnsl2" inherit autotools systemd SYSTEMD_SERVICE_${PN} = "domainname.service" @@ -32,10 +31,9 @@ RCONFLICTS_${PN} += "${PN}-systemd" CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" EXTRA_OECONF = " \ - --disable-rpath \ - --libdir=${libdir}/yp-nis/ \ - --includedir=${includedir}/yp-nis/ \ + --disable-rpath --disable-domainname \ " +CFLAGS_append_libc-musl = " -Wno-error=\#warnings" FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" From patchwork Fri Sep 8 18:29:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 112130 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp666205qgf; Fri, 8 Sep 2017 11:29:54 -0700 (PDT) X-Received: by 10.84.238.138 with SMTP id v10mr4421230plk.37.1504895394116; Fri, 08 Sep 2017 11:29:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504895394; cv=none; d=google.com; s=arc-20160816; b=trBy7MZggkzK0eS+KBWeu6OHWwkHvH1O72yk7xk+v0mASOHH/kopX5eo3LkGGS75GV dU3UDiICzVQRJOfrptvJ0vcxMA6nAPVY+FlHUcvpYkQuNrettTwA/T/bp4TMUJE+OBaJ xAUXxewT6e9xxuUscJ90mLWA1EYUW2kZp503jBbKe5CoNjSxxBmaF/JT90hg0pRXOxD3 treDQpB9EEJlS4NKXuj9hoNqqLZwnuCn2sj8DbK1xuJngzPITCeziq7g7EMCuWFhT4wn v8TVsMVL9drU8D2hdws2/R8f850M9D1FgHRKqLf8XEREGnbWUq3XhrDZZ2bABIH3lICY Bg3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Lin2v5kmbZ0asA5NjXUYAWTedBZAdTnxh36glx9M7wg=; b=nEdyxVB164gTo0r0r4u+rE4swsH8TK4mBvBDjeI8qiuQevSoSkPy14PZ/FBKgTEept aTG56V0kmQUG2CRKYtfRssW2LW3MZDO/GpQPdXsTTdF9jvDlmSj0q2dFC1hzCzlN+mRO +YBDzSg0l4c8vcj1SJbtLn7nxH/aiAPYovVPZSi2q5k9L6yr1LVeEToBhR6GebWEgWZe JPb9JuIuqYhTOUs663J+M6eXwiM82SL8HJ05tdy8XcPE86d+ZaMI4pOUNjDQkuZZvqrN 1LYDYuwD5XJuMtybxmZqG2b00c4ghgwuGrNXGl8ssGw45xdlRtm984dLCDpHjzeZTyKA dkdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PKjpG2qX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p8si1944353pgr.435.2017.09.08.11.29.53; Fri, 08 Sep 2017 11:29:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PKjpG2qX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5BC3778235; Fri, 8 Sep 2017 18:29:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by mail.openembedded.org (Postfix) with ESMTP id 938EE7757F for ; Fri, 8 Sep 2017 18:29:26 +0000 (UTC) Received: by mail-pg0-f42.google.com with SMTP id 188so6107464pgb.2 for ; Fri, 08 Sep 2017 11:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o2/qdGp0f60O/fL+y/a/YqgiSAhL6918XYK5//hsfSI=; b=PKjpG2qXbQtbOL9Ca7nsWNOXOB1HNDylOh8XW0vOUR58hguR/3ta/f8WGrV8ML5hf3 IaFkX70lLP/LNgEybTS0glzuFCbt3R2nIJ/vp9egeuBsiIsgs2dNopGRG6zF5IGv5pPK uO7eG11zUOzc1CfS30lXk4BSwimwjiW6lWnNlPGwJ5S9MOJtTWzMmAjxkAQpX+dHAAUZ iitLNc6opYETau4v4DaFJ1nEPHqewPnM3ZIZcwD0Z4sS5v2qFUCQD5TlKt/+MFvA9rjS HIjLDuIdSybQfq4yDLkKLgLTE+5bQp+AXZ1V0m3L8nYSf2xZ53/3pKjF6tEKLoZuioE6 2dXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o2/qdGp0f60O/fL+y/a/YqgiSAhL6918XYK5//hsfSI=; b=G7jIubYcLMX4chBNf+evTo2QQEa3sNTV+hU1yXGx3NfipZbvrJ7AEhINhI77zjQWcc CitSKycx7H4Z+POMswjFndrqsQQdzW68h88Gs7t1KkTS4S0beE1iZcSlEQYtJTZ7Buln H5zgPt0ue5q2woeB2A7WemvKLBBBuKOkKPdmYQu1Mx5YDGM4UAWZsHn15xUOtfdct1bR z8dGdBEgHRKiuOQl5Znj6Fx/iTg1mHTvs5inVJvwMgXe3rNA6L0g76W9obLLkFIw4weV IWcbT70hGUo4DHVbe7z1gPAb8xJJi/rvvhKvbtI7HZqoGuZv1OJ8MZbIN/Tcon/wpS4n ObTg== X-Gm-Message-State: AHPjjUhqJm7oX/SUlE04HLeTDdocxpX9i7QsghahzezhaUKv3W771x+E 6fpQ6bDbgkq2U5LR X-Google-Smtp-Source: ADKCNb5tLSW+WXnRP/M8PwxObue1gQyBbCyyJQyNIpwCBCjIel6vHLMI3jqUEIBsSYJoztnSzE0wYw== X-Received: by 10.84.235.136 with SMTP id p8mr4332205plk.8.1504895367479; Fri, 08 Sep 2017 11:29:27 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::be3d]) by smtp.gmail.com with ESMTPSA id m5sm4993977pfh.35.2017.09.08.11.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 11:29:26 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 8 Sep 2017 11:29:18 -0700 Message-Id: <20170908182918.39345-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170908182918.39345-1-raj.khem@gmail.com> References: <20170908182918.39345-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH V3 2/2] xfsprogs: Upgrade to 4.12.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix cross builds with hardening flags Fix build with gold Specify libtool tag Signed-off-by: Khem Raj --- Changes in V3: Add -fPIC to CFLAGS and drop the progname rename patch ...0001-spaceman-Add-missing-link-to-libuuid.patch | 34 ++++++ .../files/remove_flags_from_build_flags.patch | 13 +++ .../xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch | 117 +++++++++++++++++++++ .../{xfsprogs_4.11.0.bb => xfsprogs_4.12.0.bb} | 10 +- 4 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch rename meta-filesystems/recipes-utils/xfsprogs/{xfsprogs_4.11.0.bb => xfsprogs_4.12.0.bb} (84%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch new file mode 100644 index 000000000..450c6454d --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/0001-spaceman-Add-missing-link-to-libuuid.patch @@ -0,0 +1,34 @@ +From 39836217bdc41428b23a57bd70f2bfc8dddd8c60 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 6 Sep 2017 19:16:04 -0700 +Subject: [PATCH] spaceman: Add missing link to libuuid + +When uuid is enabled then we see linking failures with gold linker e.g. + +libxfs/.libs/libxfs.so: error: undefined reference to 'uuid_compare' +libxfs/.libs/libxfs.so: error: undefined reference to 'uuid_copy' +clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + spaceman/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spaceman/Makefile b/spaceman/Makefile +index 95ec3c0..060e0af 100644 +--- a/spaceman/Makefile ++++ b/spaceman/Makefile +@@ -9,7 +9,7 @@ LTCOMMAND = xfs_spaceman + HFILES = init.h space.h + CFILES = init.c file.c prealloc.c trim.c + +-LLDLIBS = $(LIBXCMD) ++LLDLIBS = $(LIBXCMD) $(LIBUUID) + LTDEPENDENCIES = $(LIBXCMD) + LLDFLAGS = -static + +-- +2.14.1 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch new file mode 100644 index 000000000..bba9a25c2 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch @@ -0,0 +1,13 @@ +Index: xfsprogs-4.12.0/include/builddefs.in +=================================================================== +--- xfsprogs-4.12.0.orig/include/builddefs.in ++++ xfsprogs-4.12.0/include/builddefs.in +@@ -164,7 +164,7 @@ ifeq ($(ENABLE_GETTEXT),yes) + GCFLAGS += -DENABLE_GETTEXT + endif + +-BUILD_CFLAGS += $(GCFLAGS) $(PCFLAGS) ++BUILD_CFLAGS += $(GCFLAGS) + # First, Global, Platform, Local CFLAGS + CFLAGS += $(FCFLAGS) $(OPTIMIZER) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) + diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch b/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch new file mode 100644 index 000000000..efc57e4f6 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/xfsprogs-4.12.0-fix_musl.patch @@ -0,0 +1,117 @@ +From 21253610f9ef87db8e2a75b863b7fcfbd0cdb421 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Tue, 25 Jul 2017 13:45:01 -0500 +Subject: [PATCH] In patch 4944defad4 ("xfs_db: redirect printfs when + metadumping to stdout"), we solved the problem of xfs_db printfs ending up in + the metadump stream by reassigning stdout for the duration of a stdout + metadump. Unfortunately, musl doesn't allow stdout to be reassigned (in + their view "extern FILE *stdout" means "extern FILE * const stdout"), so we + abandon the old approach in favor of playing games with dup() to switch the + raw file descriptors. + +While we're at it, fix a regression where an unconverted outf test +allows progress info to end up in the metadump stream. + +Signed-off-by: Darrick J. Wong +--- + db/metadump.c | 47 ++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 36 insertions(+), 11 deletions(-) + +diff --git a/db/metadump.c b/db/metadump.c +index 96641e0..4e2f648 100644 +--- a/db/metadump.c ++++ b/db/metadump.c +@@ -78,6 +78,7 @@ static int obfuscate = 1; + static int zero_stale_data = 1; + static int show_warnings = 0; + static int progress_since_warning = 0; ++static bool stdout_metadump; + + void + metadump_init(void) +@@ -137,7 +138,7 @@ print_progress(const char *fmt, ...) + va_end(ap); + buf[sizeof(buf)-1] = '\0'; + +- f = (outf == stdout) ? stderr : stdout; ++ f = stdout_metadump ? stderr : stdout; + fprintf(f, "\r%-59s", buf); + fflush(f); + progress_since_warning = 1; +@@ -2750,7 +2751,8 @@ metadump_f( + xfs_agnumber_t agno; + int c; + int start_iocur_sp; +- bool stdout_metadump = false; ++ int outfd = -1; ++ int ret; + char *p; + + exitcode = 1; +@@ -2870,16 +2872,35 @@ metadump_f( + * metadump operation so that dbprintf and other messages + * are sent to the console instead of polluting the + * metadump stream. ++ * ++ * We get to do this the hard way because musl doesn't ++ * allow reassignment of stdout. + */ +- outf = stdout; +- stdout = stderr; ++ fflush(stdout); ++ outfd = dup(STDOUT_FILENO); ++ if (outfd < 0) { ++ perror("opening dump stream"); ++ goto out; ++ } ++ ret = dup2(STDERR_FILENO, STDOUT_FILENO); ++ if (ret < 0) { ++ perror("redirecting stdout"); ++ close(outfd); ++ goto out; ++ } ++ outf = fdopen(outfd, "a"); ++ if (outf == NULL) { ++ fprintf(stderr, "cannot create dump stream\n"); ++ dup2(outfd, 1); ++ close(outfd); ++ goto out; ++ } + stdout_metadump = true; + } else { + outf = fopen(argv[optind], "wb"); + if (outf == NULL) { + print_warning("cannot create dump file"); +- free(metablock); +- return 0; ++ goto out; + } + } + +@@ -2907,15 +2928,19 @@ metadump_f( + if (progress_since_warning) + fputc('\n', stdout_metadump ? stderr : stdout); + +- if (stdout_metadump) +- stdout = outf; +- else +- fclose(outf); ++ if (stdout_metadump) { ++ fflush(outf); ++ fflush(stdout); ++ ret = dup2(outfd, STDOUT_FILENO); ++ if (ret < 0) ++ perror("un-redirecting stdout"); ++ } ++ fclose(outf); + + /* cleanup iocur stack */ + while (iocur_sp > start_iocur_sp) + pop_cur(); +- ++out: + free(metablock); + + return 0; +-- +2.13.3 diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb similarity index 84% rename from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb rename to meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb index 046dea425..bb84d2bba 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.11.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb @@ -8,9 +8,12 @@ DEPENDS = "util-linux util-linux-native" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://link_needed_libs.patch \ file://0001-define-__-prefixed-version-of-intXY_t-types.patch \ + file://remove_flags_from_build_flags.patch \ + file://xfsprogs-4.12.0-fix_musl.patch \ + file://0001-spaceman-Add-missing-link-to-libuuid.patch \ " -SRC_URI[md5sum] = "f1f9b8c752347eefdb56483dafa0cefb" -SRC_URI[sha256sum] = "c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2" +SRC_URI[md5sum] = "e348b0e1d7bd1cd82d64b91ff37e727e" +SRC_URI[sha256sum] = "b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df" inherit autotools-brokensep @@ -42,6 +45,9 @@ PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" export DEBUG="-DNDEBUG" export BUILD_VERBOSE="1" +export tagname="CC" + +CFLAGS += "-fPIC" EXTRA_OEMAKE = "DIST_ROOT='${D}'"