From patchwork Tue Feb 6 11:59:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126985 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2846524ljc; Tue, 6 Feb 2018 04:00:26 -0800 (PST) X-Google-Smtp-Source: AH8x225boVaKt1hNl/zUF+7xpI2zbeIhRCiAroc+t79xwsH6fYXv1sOop4WNAFGkZKKaKyP77m3P X-Received: by 10.99.104.194 with SMTP id d185mr1775412pgc.404.1517918426169; Tue, 06 Feb 2018 04:00:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517918426; cv=none; d=google.com; s=arc-20160816; b=O0Ql1woBPCrzAMoprUVhkoaIJj8Zyr3rs3Z4WwQktqQ2LUpnT3yLGkgy4UD1HUH3Jw LlQz6dN/jbldQmQ/RxWQ0afv5NVgoeqlG1wDeFbLMGS5hH7GCSSBLDVt+/tS0b33btzQ RCCIIn9FO6L4Ow7b99mc2Oz3SJt981wVmhxywyNAcrriZso/z5PWi7Ig7n6VIugZQHrR /e+5VLgua2/hv7C9bzfq1wv66+DMefYU29NbWVZ8zcXWS6LdAZWFe3AWQfbHU6UZX5Fh FOcPaZ7gwneVMLB4aiVw/abfIHdhJMZ9hQbTOIRAtqXrwDHDHQebFfF9iwnt7QQb1NNT QpFg== 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=aYPmFIOzD4KU7REihSIH/CZGf1VOWITT+Qawf5dfun8=; b=AoFatwxiMdfX7WM6i92TAZxrodDpJwvXbs5MmfZyjrkfkPgclCEi8y+qeovtL8zN0g a790ATPogPfaxV/oEftvy4/iUdwx60/zr3M0el4dvuCxJtwMUhCAt2tN26mbUvnPkcYg 73/80Y/NbZ6Yni+wYyXKq3J41acpIHuhKE4RyThl7Im5UWuqKCQpOpIoV6QVQnUAmqOx wkwf/qMqDxwln6IdIvmmCiCRqjyRZ6MRBsaBqf9utNz9IhZr4x9zdjrG+KH7EZRsCEjt uQUBl8dcQ4ekr+DO98drwSFJF4NGxPCts/UCqtfwDR/T8wfztJvcZniS0JsL7Srd2a09 YI8w== 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=Jh2sQTdf; 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 f129si6828167pgc.322.2018.02.06.04.00.25; Tue, 06 Feb 2018 04:00:26 -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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=Jh2sQTdf; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 45FDB786B5; Tue, 6 Feb 2018 12:00:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id 30A0E784E6 for ; Tue, 6 Feb 2018 12:00:18 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 143so3229983wma.5 for ; Tue, 06 Feb 2018 04:00:20 -0800 (PST) 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=Cb+FJ7bDsO7A8LlDM/MYMvGMrwsNP3MkuNxUElUaIpk=; b=Jh2sQTdfCNeUK0/BGZFB72rUsDzvInErssGl5tCL7ttWDCx00+KGZ9Coc3acmuhJvf 8qfliBNoJ5+PztRW7/NUZXM8XChC9xGDHi78NKpbBprv0ZRjx1gUxgkTNFwm2hQ1kPPB X5WL/q3WdEUfTQ7X9tbNi0kK4KJUA6wcGqmHPY7e4qFV8rqVt6LDL86JKwKhsfo0mHCk HqG4v5MeL/MFK1xt7jgdKQ+QJHXXKPgvJMzBVzQ6+mT1JaX1BzXYY/eircrkBYB8nCvb NvDQRZnpp7lciFOOFpVXnUnE6fFEakuHZXwr7vYJjzrDCWIxj2e97HHCcKD/K0bIlL1b ObnA== 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=Cb+FJ7bDsO7A8LlDM/MYMvGMrwsNP3MkuNxUElUaIpk=; b=i8hl8+MjIJSyLoNB//PAsBU3kWnXwUzjnuj2nGcq1VTSh/yZdzf0pnU3uMWFmx1/8p 5cfiEjrZ7KlPAz9tv05b0tKGnP00GvZmuNxmjzOlZEF9VMLD2oTvWfMemFEPmFG0iU9O oJoAlymVpFplcIa3Vn++CdkcS8MVTI3Lv4zwRX6bYUtEPQdP4zKKX0zGHVKXS7+aigcu nIk5DmCWtz3365EUBA1H3MdrSqQgwM1o6zHgM/Rf377jC7DIFbJa55tkNaQG8ckxDfPW 3Mi2DEsYWEB4v0dlnQGabadg5NX1CCPVi4+JsxX9t6rZgZusAvYVcEkhqGe6EpHa2KN+ AtWw== X-Gm-Message-State: APf1xPDhPTZ3ayomwoKaUxwWb4NzX3lLkQqdARaFVRD0Nefp24pxN3XO T0aS1EvMv/eqG+sXpEXr8Fct39a0 X-Received: by 10.28.49.212 with SMTP id x203mr1616787wmx.28.1517918419387; Tue, 06 Feb 2018 04:00:19 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 7sm8327657wmq.42.2018.02.06.04.00.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 04:00:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Feb 2018 11:59:51 +0000 Message-Id: <20180206115954.1780-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/4] expat: merge bb and inc 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 Signed-off-by: Ross Burton --- meta/recipes-core/expat/expat.inc | 25 ------------------------- meta/recipes-core/expat/expat_2.2.5.bb | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-core/expat/expat.inc -- 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-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc deleted file mode 100644 index 0ee6c276d99..00000000000 --- a/meta/recipes-core/expat/expat.inc +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A stream-oriented XML parser library" -DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" -HOMEPAGE = "http://expat.sourceforge.net/" -SECTION = "libs" -LICENSE = "MIT" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ - file://autotools.patch \ - file://libtool-tag.patch \ - " - -SRC_URI_append_class-native = " file://no_getrandom.patch" - -inherit autotools lib_package - -# This package uses an archive format known to have issue with some -# versions of gzip -DEPENDS += "pigz-native" -do_unpack[depends] += "pigz-native:do_populate_sysroot" - -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/expat/expat_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb index 337287b93bc..f7a5b36ac74 100644 --- a/meta/recipes-core/expat/expat_2.2.5.bb +++ b/meta/recipes-core/expat/expat_2.2.5.bb @@ -1,4 +1,30 @@ -require expat.inc +SUMMARY = "A stream-oriented XML parser library" +DESCRIPTION = "Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)" +HOMEPAGE = "http://expat.sourceforge.net/" +SECTION = "libs" +LICENSE = "MIT" + LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ + file://autotools.patch \ + file://libtool-tag.patch \ + " + +SRC_URI_append_class-native = " file://no_getrandom.patch" + SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" + +inherit autotools lib_package + +# This package uses an archive format known to have issue with some +# versions of gzip +DEPENDS += "pigz-native" +do_unpack[depends] += "pigz-native:do_populate_sysroot" + +do_configure_prepend () { + rm -f ${S}/conftools/libtool.m4 +} + +BBCLASSEXTEND = "native nativesdk"