From patchwork Sat Dec 1 01:08:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 152616 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4320415ljp; Fri, 30 Nov 2018 17:08:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/WdkMSv7aqF1w0MkovCMPEN5OUz4G8NNRAilrOLTgAYCjtYnNyv6F+ZTgTM2IHtsbOSXi2T X-Received: by 2002:a17:902:bc3:: with SMTP id 61mr7792016plr.15.1543626508849; Fri, 30 Nov 2018 17:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543626508; cv=none; d=google.com; s=arc-20160816; b=Cv0DM8fqm7R1GW0jqo/aWJ+avwJJ/T1H8tShy565cSErmR02SiiGlKAG950yA5EvFW y2ujhnIF4FP7tOVkJCn29LEltNp7bMjpb/DAfVnp7biXzdCbkCFnZdUT2NJTBbVc2lBx gvuzjuKlwe7JD0R/xCSoYLeXiBeF8Sap6qua9Ii3rL0OZbOZz7/Gp8Cpc4UJoMU5ggJQ LUO/fBEkmsod5QQheZHCBTjBSbHt6qDDTQnKRY1OPsivo+E5Z9GvPe4g2Fnoe3tdLLsl 0irKR83RJ07RnhGq4LSLQoj9ztr3HvQQUVl7lGUXeEu7JTuLXJXRlRH1VqxPSRvFFiex k6fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=w4kqvDXgeu1dq8hONnODvbmkdcG05GbbVM4TqXPOEe8=; b=PBeltkeMIDFO9QHkJ/gBhk2xwt2iKOPVVFTBzdUcqkaVcl4mwKC2ayDTK3cYlwtOCQ RBtzOQXBarqsJle6sq/OcIny4STOskQxPixREg1qntf5mPAulER/yFUWahMVxqStvpyR ceIQCh0Y9UBW723tXB2IxWClJcgZ47A0AxI80F5egqxASW/PpJwRLheAe56AdBawD+wV 0w72yoyuYNax+ptZFES54rrcCIZAvXKQEcr4Ir397/cTzVzmzV3ngCuFhxehAsiUmy8q gCxRVJxEGquNQAKUCIvHxf4sSHq9MwdoJ1Yq+44LojdbPjK0WwovbbajbGUZw//DvTbi EIJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qxghj6dc; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE 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 r28si6407150pgm.317.2018.11.30.17.08.28; Fri, 30 Nov 2018 17:08:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=qxghj6dc; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A35366D766; Sat, 1 Dec 2018 01:08:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mail.openembedded.org (Postfix) with ESMTP id 7D6D16C48A for ; Sat, 1 Dec 2018 01:08:21 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id p8so3620546plo.2 for ; Fri, 30 Nov 2018 17:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9krnnpJjXEiptjIf5IRpramDu1eXt21kcpPr7Vnsrw0=; b=qxghj6dc62NLnsi25S6PT6fmKIijnC7Un1QQ76AzFARhETin0K3KnIE0pbvJqdtNRE 48Mx6z400vDfxqy5QuQhMW2rHk6NXySwXNO73Y/weYdLaSDS0/tlxGOUuTsnBrPASvAQ 4QVcrwYrn49ayhCwz93d9Yc6wSN0xQ3KUV4MkW0zQT/iZ7U0In3SYnG9wvneG8Enotcx 7g+/uz27bNYRm7pAazN9TU86Ok3KaMYXvAaXPPIbPMtuRygxMf9gnQnr1cMmipwTyaX3 i3vi7aQmC+CAVv1IXQtpva+BMazSaq3RwxptFh0efNCUpTTdeWDsH3Fd7lTXTMu3rRQu d+Xw== 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:mime-version :content-transfer-encoding; bh=9krnnpJjXEiptjIf5IRpramDu1eXt21kcpPr7Vnsrw0=; b=QMOPBVZmLtRTKeT8YnH1Oxf5WTt9hFfJsxAtRbmH7pgUHspgmiSC7+OvbhQcYVJ7W2 DSg2TS3Z8YnFnBedeQD2/h8+LIecSzPeOfoD1ML65Rv4yLLa9g/XRYsBWj5DFGfN6NEt S6fiSdErAojOeUxnA41qqvl/QdcGkf9WRLfImKuN/6Yof/UxrO+8a7d6Blu1mdGLr0zx 1VfSF7SSEu4nH6N5Bvg5j+3DbblGodirxXXiA4wdltxNfvIU7SKxfgScL/fnUc5RWyGc 6JmCTCNJro3+Iy9g+bnzIRjWfZHOWc2j8DSH80tUIlrujzuSXN/8HIK9BK9+nQKByYSM 85FA== X-Gm-Message-State: AA+aEWZoIvT6dAlupXxA5LVYkgEYNt5/dVrHI0k7/amFkH8QHzF3GbYq 4BdZZwZH1ctaD/UcJG/1ohcQHjNVb+g= X-Received: by 2002:a17:902:7e44:: with SMTP id a4mr7768863pln.338.1543626501799; Fri, 30 Nov 2018 17:08:21 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::26ab]) by smtp.gmail.com with ESMTPSA id q199sm18683422pfc.97.2018.11.30.17.08.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 17:08:21 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Fri, 30 Nov 2018 17:08:06 -0800 Message-Id: <20181201010807.28924-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/2] nfs-utils: Upgrade to 2.3.2 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org enhance the musl-only patch to degrade certain Werros into Warnings which helps in compiling on musl, since its checking for __GLIBC__ defines which are undefined on musl. Signed-off-by: Khem Raj --- .../nfs-utils-musl-res_querydomain.patch | 43 +++++++++++++++++-- ...{nfs-utils_2.3.1.bb => nfs-utils_2.3.2.bb} | 4 +- 2 files changed, 41 insertions(+), 6 deletions(-) rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.3.1.bb => nfs-utils_2.3.2.bb} (97%) -- 2.19.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch index a169e6a222..22002fadca 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch @@ -1,17 +1,24 @@ +From caa19231196d73541445728e6813c8fa70345acb Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Tue, 26 Jun 2018 15:59:00 +0800 +Subject: [PATCH] nfs-utils: 2.1.1 -> 2.3.1 + Fixed: configure: error: res_querydomain needed -Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096] +Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main/nfs-utils/musl-configure_ac.patch] Signed-off-by: Robert Yang + --- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure.ac | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac +index 276dec3..760238b 100644 --- a/configure.ac +++ b/configure.ac -@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then +@@ -408,7 +408,7 @@ if test "$enable_gss" = yes; then fi dnl libdnsidmap specific checks @@ -20,3 +27,31 @@ diff --git a/configure.ac b/configure.ac AC_ARG_ENABLE([ldap], [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) +@@ -547,11 +547,11 @@ my_am_cflags="\ + -pipe \ + -Wall \ + -Wextra \ +- -Werror=strict-prototypes \ +- -Werror=missing-prototypes \ +- -Werror=missing-declarations \ ++ -Wstrict-prototypes \ ++ -Wmissing-prototypes \ ++ -Wmissing-declarations \ + -Werror=format=2 \ +- -Werror=undef \ ++ -Wundef \ + -Werror=missing-include-dirs \ + -Werror=strict-aliasing=2 \ + -Werror=init-self \ +@@ -579,10 +579,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ + + CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) + CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) +-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) + CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) + +-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) ++AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"]) + + # Make sure that $ACLOCAL_FLAGS are used during a rebuild + AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb index 6d450c7510..5c0586fa75 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.2.bb @@ -34,8 +34,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" -SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046" -SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5" +SRC_URI[md5sum] = "01f5e6cd187aecf72b489c9c86cce865" +SRC_URI[sha256sum] = "3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.