From patchwork Tue Sep 8 07:24:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 53254 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 0653422B11 for ; Tue, 8 Sep 2015 07:24:56 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf32235110lbb.3 for ; Tue, 08 Sep 2015 00:24:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=FGCbgPcFVWDD0EiuB3Wd9LBxqMCjg9D5654kNKkk/D0=; b=Imep99tMee8vsLILtQSE+qLaZ3SiHiIteN9U7APUFcJmcwdDpoFNEYz0mrOj4p+LWG Le1BmwDj7AtBx9Bok4Wqxyzcyox/e4A6KVvAl4joczghfclMw7CqOvTs9qi2dD3X3jj3 rG3TfBf2y2/OHqSSEOP18eEgCqF45dVpZrl01AUGJSCI34wqhO8sD8QfUIQ1RmZC+Iad ByMXscpcSG0P5RdhXS8dvYjuwDwXB+C1gR8G3xjbeni70ybjdvXJeuV3DRxfo6L7VQeZ gAx/9qSa7LW58KQyUHCVajjX6T3ppGdRt0xQGn+iknFcqsAH3HRhQhHxzM/1o9+VCK9P at/w== X-Gm-Message-State: ALoCoQnqU4vFG+45LepbLq0RdVVZ2RpOFJi+10UFErBUv6Mky6RlH2Mwc5ohjUIT9d64nUgysmQ1 X-Received: by 10.112.173.230 with SMTP id bn6mr6050114lbc.15.1441697094961; Tue, 08 Sep 2015 00:24:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.66 with SMTP id z2ls13611lag.76.gmail; Tue, 08 Sep 2015 00:24:54 -0700 (PDT) X-Received: by 10.112.158.38 with SMTP id wr6mr12158245lbb.25.1441697094803; Tue, 08 Sep 2015 00:24:54 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id o9si2393503laf.80.2015.09.08.00.24.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 00:24:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lamp12 with SMTP id p12so61674259lam.0 for ; Tue, 08 Sep 2015 00:24:54 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr20815151lbb.36.1441697094327; Tue, 08 Sep 2015 00:24:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp787623lbq; Tue, 8 Sep 2015 00:24:53 -0700 (PDT) X-Received: by 10.68.69.17 with SMTP id a17mr55368849pbu.10.1441697093338; Tue, 08 Sep 2015 00:24:53 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id nv9si4012551pbb.37.2015.09.08.00.24.52; Tue, 08 Sep 2015 00:24:53 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F12A975E80; Tue, 8 Sep 2015 07:24:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mail.openembedded.org (Postfix) with ESMTP id DD56775E80 for ; Tue, 8 Sep 2015 07:24:44 +0000 (UTC) Received: by wicfx3 with SMTP id fx3so108919831wic.1 for ; Tue, 08 Sep 2015 00:24:44 -0700 (PDT) X-Received: by 10.180.102.226 with SMTP id fr2mr43696915wib.3.1441697084429; Tue, 08 Sep 2015 00:24:44 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by smtp.gmail.com with ESMTPSA id t7sm3233813wia.9.2015.09.08.00.24.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 00:24:43 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 8 Sep 2015 09:24:35 +0200 Message-Id: <1441697075-16453-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 2.1.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] acpica: update to 20150515 and fix conflicts with other layers X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Meta-virtualization and meta-luv both has iasl_*.bb, which is a subset of this recipe. Extend this recipe to provide the native tools and add the necessary runtime conflict options. Also address style issues by moving around a few bits and adding some whitespace. Signed-off-by: Koen Kooi --- .../acpica/{acpica_20140828.bb => acpica_20150515.bb} | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) rename meta-oe/recipes-extended/acpica/{acpica_20140828.bb => acpica_20150515.bb} (80%) diff --git a/meta-oe/recipes-extended/acpica/acpica_20140828.bb b/meta-oe/recipes-extended/acpica/acpica_20150515.bb similarity index 80% rename from meta-oe/recipes-extended/acpica/acpica_20140828.bb rename to meta-oe/recipes-extended/acpica/acpica_20150515.bb index fb19c88..de897e1 100644 --- a/meta-oe/recipes-extended/acpica/acpica_20140828.bb +++ b/meta-oe/recipes-extended/acpica/acpica_20150515.bb @@ -5,17 +5,22 @@ Power Interface Specification (ACPI). ACPICA code contains those portions of \ ACPI meant to be directly integrated into the host OS as a kernel-resident \ subsystem, and a small set of tools to assist in developing and debugging \ ACPI tables." + HOMEPAGE = "http://www.acpica.org/" SECTION = "console/tools" + LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" + +COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" + DEPENDS = "bison flex" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ file://no-werror.patch \ " -SRC_URI[md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" -SRC_URI[sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" +SRC_URI[md5sum] = "2bc4a7ccc82de9df9fa964f784ecb29c" +SRC_URI[sha256sum] = "61204ec56d71bc9bfa2ee2ade4c66f7e8541772ac72ef8ccc20b3f339cc96374" S = "${WORKDIR}/acpica-unix2-${PV}" @@ -31,4 +36,11 @@ do_install() { install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract } -COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" +# iasl*.bb is a subset of this recipe, so RREPLACE it +PROVIDES = "iasl" +RPROVIDES_${PN} += "iasl" +RREPLACES_${PN} += "iasl" +RCONFLIGHTS_${PN} += "iasl" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native"