From patchwork Thu Sep 7 13:35:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 111927 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp102146qge; Thu, 7 Sep 2017 06:35:18 -0700 (PDT) X-Received: by 10.99.45.67 with SMTP id t64mr2756730pgt.62.1504791318298; Thu, 07 Sep 2017 06:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504791318; cv=none; d=google.com; s=arc-20160816; b=wlNUZb7lPXhP4Gr6gHe6sR/0Gv0uquY60oEhKCjiEBmHcvhvwlG9XEl9RutdsRBDwM R6unG278gzTCA76UQ9IBbEFIe5WPsLfX9OAIdClapJAZk4RB7AIwfxcK2QhqPz6n1HVn Hcn8DxKp7HZ6PXTH0QTvDhMfSfMdc1k09HZ64l2QfERRRbml1MFt+nVAUmKtEAqnuVBu awwneQcuWiS3v6cC5mGPveTrqblrISI4MdCu20HlqlAuXogkNYqg+z4/dqm1WHNouH8L tNfnXqs9Nt3ySsU+BAfrTLCDqcGZi1kA4PQ52AT1j0XI4+UrdxYw6P5mSt7o++CjbNjX VNfQ== 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=a/ah6evsj40YoNLqpUlK/bUOOo8GW2VLcn0KfmayOkE=; b=T0Mi4wttJ9+KLeIBIurrfaG7I6Nkydgocyi1UHCw2azxReYqGsXpxu4lYWt1mj4FSU ncdxFNYTpe5WXG8V0o2odhtdcfGDHqTm3HsGRV1piEFvC0DXoClm23p/mNszJsiCtgan Qt11xFPouA73B81RXbRdConE91Q0OedqHqfPUwzEDvQ3bc5Vx5PvuUNengcQQKmVav2D xcU+zSKkCkhV/RI8Lf7RDWlSCkxlusCyHXqq0T+hRp8nIfGf7LGL4xMEN9uq1TfY4CEA vaEaTcqNCu8R6TA5MdN1UZsKYla4l2WNNqnequ6AzpfiE49yArbPWa95pn2XH+W4d78B daMQ== 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=VUiaY611; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 43si1941902pla.774.2017.09.07.06.35.17; Thu, 07 Sep 2017 06:35:18 -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=VUiaY611; 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 Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3F8DE780C3; Thu, 7 Sep 2017 13:35:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by mail.openembedded.org (Postfix) with ESMTP id E5871780B8 for ; Thu, 7 Sep 2017 13:35:11 +0000 (UTC) Received: by mail-wr0-f172.google.com with SMTP id v109so4090684wrc.1 for ; Thu, 07 Sep 2017 06:35:13 -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; bh=j1PVn/af4X6Tc1er6+FBlAKlVhZlwjMSfJ8lSdOY4zg=; b=VUiaY611wmXQqij9WJQotgZT9EIr+FW42ZDc5ep7BqOUoW8i+dtivuwl7CZWi3yH0O rdiaSQbxZaqpnS6BYXP6Bn80gcW0UyfWYHPmIADU90gxD05v7WUN44voOAwJhHSkSC1x PGlktBy6Fo5bJX/Od38/ZvZK0PNkL+NyTwdAX+evJFkw2hbmRwx3B7zRBGPpB9RWdJO/ ilnO3CNTkOZ8PvPBUBYmnXFY9eBeJf2hKPLcQ7xDozbcEYyUdJPMoq4qAriAIisaf0yB vKNuSTPN587DK6Q3iZYv7S/8dUlvhDh+o/DKojRO8ks+w4NipUCJdzlRbD4V21MiiPt6 feOw== 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; bh=j1PVn/af4X6Tc1er6+FBlAKlVhZlwjMSfJ8lSdOY4zg=; b=ZqWyywkRIUpwIeINvswveBB60UN/pa4a3se8lWDiqqt18+ItC+v8fredXowpCKE1TL A+jrsroQu/JUIcpUuK+WF5kqZva4n+qVZRT6rTHrE/u8G1jlVHgZAA8MsJ5UqUgxHaSC n8ZS19VXgWbFAdVhyI3ulapYsq8C2Do9w6l5zXwGWJ8rcElDxutHrDrFzHvG7bFuUvdu T5tqce0ErwMsccE1h3VfEfk7xLWXc11vI/azZoicahqFtUbMWIkl2gIEGcE/jB/CH+57 CrJuH6LRoh018MICXLBfFQ62FGgUL3Rk7dT5Gc6Fc2mVOTiYA8LuYgxWdG0oXjBs+BYK UAcQ== X-Gm-Message-State: AHPjjUjoAmG3d3Y+peS/KWwgG+TaLWOQ688a6pbULZxo8HSK4oEP9Hmz aJ+Y9vtFk/IgaPSA/gE= X-Google-Smtp-Source: ADKCNb4Y+vymm25Ovegj7TemtenuZfGM+tqx5q+uYqlzpjSDulxVxq1tltFsb38zOOizJ8THvLgY5A== X-Received: by 10.223.161.194 with SMTP id v2mr2358796wrv.45.1504791312005; Thu, 07 Sep 2017 06:35:12 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id i75sm1437114wri.82.2017.09.07.06.35.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 06:35:11 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 7 Sep 2017 14:35:09 +0100 Message-Id: <20170907133509.30701-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] libfm: remove file which conflicts with libfm-extra 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Both libfm and libfm-extra provide /usr/include/libfm, so remove it from libfm to avoid sysroot conflicts. Signed-off-by: Ross Burton --- meta/recipes-support/libfm/libfm_1.2.5.bb | 1 + 1 file changed, 1 insertion(+) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb index aca59e1476a..1ddddfdc990 100644 --- a/meta/recipes-support/libfm/libfm_1.2.5.bb +++ b/meta/recipes-support/libfm/libfm_1.2.5.bb @@ -32,6 +32,7 @@ do_install_append () { rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h rm -f ${D}${includedir}/libfm-1.0/fm-version.h rm -f ${D}${includedir}/libfm-1.0/fm-extra.h + rm -f ${D}${includedir}/libfm rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc rm -f ${D}${libdir}/libfm-extra.so* rm -f ${D}${libdir}/libfm-extra.a