From patchwork Tue Sep 3 11:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 172792 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp5553667ily; Tue, 3 Sep 2019 04:19:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqxoM3JQxN7j8advZTOto+HL7SPe0jMHbXjcfsLD5KFClbJ29ni825aXvS+DMEgKrFQERSAF X-Received: by 2002:a63:36cc:: with SMTP id d195mr29352984pga.157.1567509591661; Tue, 03 Sep 2019 04:19:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567509591; cv=none; d=google.com; s=arc-20160816; b=Fkx+RCEgA486geX/ms7ecSQy+cmy5X77GWMJUMEnyaXty7EejcHwSClIDw/J6wGfqc uaUDGztyX9JA5X6FsPy/pVGipdPurReuJEArjIKQUjnD9OH+6udNVmm661WLHrEdhGQh FGJqUaGw2E8hPeEIDeTgBEb5tALm2Hq6rT3abW+z0IOsAF4huX2KFy4/+Un8EEHvp2DL Mlamx2OeQqrEyX/P9G55wngBAoj3h+v7b6R/zagIXZSIgjbX6iBWgXy6MBXZUHCsZl9e g+2Zd2/2giV6JJg0QY6sqoLQEpDAAuwecNTeCtO8ODqFC9b2U6/R1AxpN7Y8yAKIknTC weig== 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=r8HjPTtapYg0kjy7CJ+1AadNBnFxwaXqVssel4KTG6o=; b=Y9yoefMq88oBh15Xq99JfVpIRo0YKqQ9jGvqlGyKVGOVqMiX6pD08WaV/K39PPg5Gg xZqNwx67ZhQWQeufQhZ3N1dGN3t0cFH2nBfpf0mgINIV9nNR4YoQb6JpU7t6ssVJRa6+ nFp5n+ObERO7N1Yd3CEk9CoMnG+/m+WQAaA3u7FzIOevOFliK07O1SNJcVgzKqHHTLhL gn30Km9chS4LAx+deoNT0FxI/65YkFnznDfRjrNfvwD1NXiC8Ea9mw2S6Grw97Pn53rq +7zjuaqoBz2eJrdIULbJvxCNyYzPX7tUqxr891PDWCfyJ+NHO1O9gbmUoNYgIrFkxbNM UvhA== 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=XtTMc4kD; 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 g26si8004014pfq.77.2019.09.03.04.19.51; Tue, 03 Sep 2019 04:19:51 -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=XtTMc4kD; 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 2A1947F365; Tue, 3 Sep 2019 11:19:49 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id B3E897F35B for ; Tue, 3 Sep 2019 11:19:22 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id j16so17038656wrr.8 for ; Tue, 03 Sep 2019 04:19:24 -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=74JsdhOlokErAPSalH8T+nIj0BBScNzln7v4urgM01c=; b=XtTMc4kDDz7deO9kZ1/h9i8TAKNWh3nMU0ilJoulqyNyv4BdRs2EPWQkea1zRMrjuf nqQ+M4uy+2Gfmfftct0tcfXBRnugs/0uB48fHizMTXxBHNrbb0v1YxHBVmJWFyblxjao S2z5J0Muy+AcvniY2Q4A1Jm1mEbgumeU82wUEHxh5vGtgiQi+Iuk+CqDT5/MinnCh2qT YbH20imSwdmTYF5puTGVKluDlxS6EIezcl4Sim672YvPaKGerwRKG2AL7laSs976WslA eFGbju8UgNymVeBH5GFEmFmiTJGrlm/tMxcOA2kyrbFJvIj03t0k3JaYEHEwPkXHToU5 i33g== 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=74JsdhOlokErAPSalH8T+nIj0BBScNzln7v4urgM01c=; b=ttnvYq983Bt8VJJ4zt6wClfTUuzCezqWAxBrrLhk8EXABiuilGhVoav1tqqklsxz8E dr36lTotHUZEv5y/2XzGr1Ym92XxGvuV/PWXqDRyhnDJTDs02eTB5bEY2lZPPMUB5v5s L+33tf4uf8SccoRG6alQPBZOcxRGJ4LzGhNmadR0PXogXYoo7Twsea5YHoDTqH4oR1tb YRwG5TXgBL73JNDUS/pMNidEOG0UVuSUXb3Bt3whA4LZmPPC/LRIGwDbIyUSnGt3SsCH L2xXpSDVGMXNXmDQC8xH6oT/U288WyRKFaVp4m0dCENIOBYpPcyEzHOAwB9JXdOJPftN nWEA== X-Gm-Message-State: APjAAAWLGxp8ktYEnMPTn3dNPwO2VG5na8utAhpTaUnnvKflq7gku3uv N67CmU3Ysn9M3OTX3wbiQxHYS8QE/T8= X-Received: by 2002:a5d:5606:: with SMTP id l6mr15003148wrv.108.1567509563150; Tue, 03 Sep 2019 04:19:23 -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 r1sm19747161wro.13.2019.09.03.04.19.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 04:19:22 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 3 Sep 2019 12:19:21 +0100 Message-Id: <20190903111921.15867-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH] libnl: don't patch libnl-3.0.pc 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 This patch originally came from oe-classic in 2010 with the comment "fix pc file so that it actually links to the support libraries". If an application wants to link to the support libraries then it should be using the relevant .pc files to do so. oe-core builds successfully with this patch removed and other distributions don't carry it, so drop the patch. Signed-off-by: Ross Burton --- .../libnl/libnl/fix-pc-file.patch | 17 ----------------- meta/recipes-support/libnl/libnl_3.5.0.bb | 9 +++------ 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-support/libnl/libnl/fix-pc-file.patch -- 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/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index fe8b833a1ce..00000000000 --- a/meta/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Some packages are asking only for libnl-2.0, but expects to get also -libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. - -Signed-off-by: Martin Jansa -Index: libnl-3.2.14/libnl-3.0.pc.in -=================================================================== ---- libnl-3.2.14.orig/libnl-3.0.pc.in -+++ libnl-3.2.14/libnl-3.0.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb index e6a225af525..c0609c4d900 100644 --- a/meta/recipes-support/libnl/libnl_3.5.0.bb +++ b/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -9,15 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 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 \ -" - -UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" - +SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz" SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" +UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" + inherit autotools pkgconfig FILES_${PN} = "${libdir}/libnl-3.so.* \