From patchwork Tue Sep 3 11:19:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 172791 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp5553186ily; Tue, 3 Sep 2019 04:19:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLoAYOGNIqUp3k5/WTWqfzoEQQgWvpCPKZGQFKjEBewOigXptKh8RJVa91MkwznsDHdgbE X-Received: by 2002:aa7:9202:: with SMTP id 2mr6916389pfo.81.1567509567202; Tue, 03 Sep 2019 04:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567509567; cv=none; d=google.com; s=arc-20160816; b=lDTbou1CA9qL1tYaRH6Bg1stYvUtsV3n0ikNuzTKfW2YSaDqB8bh+OdlYe4FrSWZXI SOBAU39ZEtQoWcgxafDfFCyoKSu8CIeIRwXHPxjo7LehUKSSs4FtZf4+KSDzU999DGOO yHTrcWE/8TGBTrygZfJUHqKUa7wxCvA7GNDDlM01b7UHxYcveZlgH5WW+kXKgr7KpDLL EtY8aMZCMjAw7qp+7phT6V4FSkga3nBiA18dqIp+NgtycSCxhTIrLwcuF975O+TxwRy4 BFiFsuHD/uvLhKutGgvlTaZcZYBcHETPFOb1Pg+C5/1QKWUp2VZjxo4WtE+qqswWqqlS DIBw== 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=+l0e8CnYFdpKMpaQa5eTKk+qkgjhreu6zkVfkbWT/Xs=; b=PaoZYEDCmWVCLfEfB2my02wioo0r1WG4kcbzthR6wGfu40SReMGGqZOGj7B3ssQ4Ma 9ZYHbWTKQVWb2bnG71PYS69eHw/THPv5YwB8wjRN0cW/yYmd+JkwPXRu9hprEDMrLA+G dPKqDbRuFd+tExZbU0VCqw/NpRS31Gm+316wu8y80lAB3pAmoudpy/ZhL5i558uvymJ6 PTVXL6C2byUq+jEV/aQbFP17DLUtVl60JUh0hmjxvkmQ0H0epASXop5BTxTxqOR5ZiLA gX8FZnYj6bwJQeF/rCCmtpX0GM+Bbp4Z6XsdkQUwCoUTzDvhyk9/7cu1+brdeT9Otyxm xXLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="DVI/fnMw"; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s13si14415801pgn.123.2019.09.03.04.19.26; Tue, 03 Sep 2019 04:19:27 -0700 (PDT) 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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="DVI/fnMw"; 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=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 17F3E7F352; Tue, 3 Sep 2019 11:19:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 382787DE4B for ; Tue, 3 Sep 2019 11:19:18 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id g7so17078502wrx.2 for ; Tue, 03 Sep 2019 04:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SL7HW8EW4Qlkn7Zlon/vAf9qc07jK45ogF+0LSRGz70=; b=DVI/fnMw6va1ZEIp7ekU7Ai8vUKEpI/vZf3SRBkQ8b1HZdbu/XwfYTUWkOoNGIiBB0 F80L/r5DEPQoU21ZUPYCjAMFL6mwlO9/duqNySQtDJ9ACunWdhvCqSmzU66ouhoUxaOi sOGFSUiUqFHdOznGlmAUsx/lhzQuqYA5GjZRDWK5cLd0MWxU2BSqVUuaNdMPH65zI8Kx +p/tkdD3YoOPyNBvWBGY+/dxDxy5P7qCZeh670SdLoKV1YPbr1rdthnygMCx2+9r/FIg 2mWFK7mxlrvX3nO3Cybcr/85qCgldFFMR3L2RAY1Xuz7f5ibTUAuetnpz6FsBAEOGOi9 sHMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=SL7HW8EW4Qlkn7Zlon/vAf9qc07jK45ogF+0LSRGz70=; b=aAJzc0fvgZTX9hEuTKrQn6XVndfxrC9Am4CwtHCDkXlmhlvxNk+9nBGNaH2epwvfWQ AKudpUGJr6f1Eujpjlpi14r2D0C/Pj4YduINE3bAk+gHXTMnf56J09/trrGTHhaIufca FCUQ1mJPt3hESBm1MKw54MEkGoSEDslf4ShFeCYvhd/Z+6t9Du+rQMagGRUCk+1n6iCa 3AtNV+Pp5LDGqI+bR2aBKhPvmC90b96GNsCUayWSsh/owc3bjWy9EEVvoDDwxU4Sr6+c 0cCXSv1V8mX9312FnnDVlEZvOGITNOCNnaujo0aL/wyQfu0rM57jkCoaWkrCKe2jDRlP lZDA== X-Gm-Message-State: APjAAAVFlGuUVUpG9b/XovqFqIyW0j09jlNwc/lfum20Ra2n1JHRvx5T EsVU7ktGNq0HQknk2PwLx84EeR5pI9k= X-Received: by 2002:adf:f505:: with SMTP id q5mr25210044wro.242.1567509558816; Tue, 03 Sep 2019 04:19:18 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id u68sm27358471wmu.12.2019.09.03.04.19.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 04:19:17 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 3 Sep 2019 12:19:15 +0100 Message-Id: <20190903111915.15803-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH] libnl: upgrade to 3.5.0 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 Drop the musl workaround, as upstream has solved this correctly now. Signed-off-by: Ross Burton --- ...fix-libnl-3.4.0-musl-compile-problem.patch | 38 ------------------- .../libnl/{libnl_3.4.0.bb => libnl_3.5.0.bb} | 5 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch rename meta/recipes-support/libnl/{libnl_3.4.0.bb => libnl_3.5.0.bb} (87%) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch deleted file mode 100644 index b20a2996234..00000000000 --- a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] fix libnl-3.4.0 musl compile problem -Avoid in6_addr redefinition - -Upstream-Status: Pending - -Signed-off-by: Huang Qiyu ---- - include/linux-private/linux/if_bridge.h | 1 - - include/linux-private/linux/ipv6.h | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h -index f24050b..8f7490c 100644 ---- a/include/linux-private/linux/if_bridge.h -+++ b/include/linux-private/linux/if_bridge.h -@@ -15,7 +15,6 @@ - - #include - #include --#include - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h -index e05e684..f16349d 100644 ---- a/include/linux-private/linux/ipv6.h -+++ b/include/linux-private/linux/ipv6.h -@@ -2,7 +2,6 @@ - #define _IPV6_H - - #include --#include - - /* The latest drafts declared increase in minimal mtu up to 1280. */ - --- -2.7.4 - diff --git a/meta/recipes-support/libnl/libnl_3.4.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb similarity index 87% rename from meta/recipes-support/libnl/libnl_3.4.0.bb rename to meta/recipes-support/libnl/libnl_3.5.0.bb index 90dc644be4a..e6a225af525 100644 --- a/meta/recipes-support/libnl/libnl_3.4.0.bb +++ b/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -11,13 +11,12 @@ DEPENDS = "flex-native bison-native" SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ file://fix-pc-file.patch \ - file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \ " UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" -SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311" -SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" +SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" +SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" inherit autotools pkgconfig