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" From patchwork Tue Feb 6 11:59:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126986 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2846759ljc; Tue, 6 Feb 2018 04:00:37 -0800 (PST) X-Google-Smtp-Source: AH8x225+AWh4Hp1sFlBPpBa7Foh+3kT87Tmo6CU0Z+ZPhlofEdQaR1Kcp3D3BHi5xNPAio9VcXD9 X-Received: by 10.101.80.202 with SMTP id s10mr1765411pgp.226.1517918437621; Tue, 06 Feb 2018 04:00:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517918437; cv=none; d=google.com; s=arc-20160816; b=M1MHuEsNAIZEN5ZQLkPy73iuWlGrIr9OvUCFeaNgJNzKbtHDLdQcbPCJP8HLNMqOoF RH/AXWS/F1RvJhVVk7EFtFrzw2cymh8E3YYAc3AUCQUKW4ot4/jJ5msvCsON3KBwJKq1 4NvHdgvhEVJX+NilZ+HloOOyyK0qbqHYFAC/Q9DmnEN9xw8DWfjnBXYD24sum34gQG/H dDd+IrPpJAUvVLTLXuudMM2O13iBVikwF17464wwddRxGvVHH/CGMzWbSKOihRTRBVwN 33qfDPDM7OULVR2P2vd/W5RNwh6nkrJa1O5FaVxTlb0292A63BcMkIVd1bFLfimr5tyi XNoQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EDf6wgpVKV/wCZallRwAtFzjA/TEeVx4mR0rfzceyok=; b=O8AuKxDg4k2V0VUz/lnaH7/sp+hujuk5CtKKRcOUm/3QW9VzBxoJfbSsStoc1aqH8A zG/bppWw6jIMo8uxEn0Bqn4IEg/6PqXIKuMdBdH/kxs17Ye/kLOlUO5npW7Q3gFJ9riA r93Y0s0nh7WbtKk63y9VmMz0ztSmWEZi9G4RyGgp+e2t8hT2a9s03BAelxUznCoPG8KB ObRHztos9qxW/9FyAqBmZDkF8M9pntlJ9NnbPzKa6ipHGT2LrygO/DlIqO1vzR7tnfdk pbpn8igyQ6ma0bVE/+xnVV4wL2AUJU77VUZc8/sVvcbgTxGgMnp1a2EZPg1KLEpqt+NA PMZA== 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=1gbR46oo; 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 f34-v6si1456950ple.102.2018.02.06.04.00.37; Tue, 06 Feb 2018 04:00:37 -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=1gbR46oo; 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 6B11E7873C; Tue, 6 Feb 2018 12:00:34 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 119DE784E6 for ; Tue, 6 Feb 2018 12:00:19 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id i186so3235757wmi.4 for ; Tue, 06 Feb 2018 04:00:21 -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:in-reply-to:references; bh=beiLA6j7tQpaLgemJpEl0lPu0rLauM8pTQyIvn1VAIE=; b=1gbR46oo9LEznFeGhAR9FOJmFTUoqOZCkfuoO02Lhupxkanjbx+0rASeNd30XFsSu7 JwGscxUJbHMfN0TfqdGIuI5eOOPapCPaPIKC4jFgkhdO/ijPkpFpeSZKCfruZziMrYGP VINAq0wpY6CjjPhH/vWmSg7ycifiMVG3OMh6iIBw1+FOK0Bp0QfaFI2ToCEPFV4R9n7U QX0ZuWeSlqXwvy2mEPgz+GV7MsTIfsF3Gv27aeenrosAlrdKPj6vVipR8tRfe6Z9p5mt JVbFBCAQYiEY3Ap1jyM7FhC27ojDxSs0o4sPjckapcHjDBSJ/3iUzvCgswuN/YN5GTlN LTrA== 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:in-reply-to :references; bh=beiLA6j7tQpaLgemJpEl0lPu0rLauM8pTQyIvn1VAIE=; b=IK0N5KwioAKAMHvQNIzfyGggCRF23trLj6hxwq1vfnXh4AZ+zX8Kt5IA3zAb3czpMl C+wURoJm4mZ9GnvDtboXZI0+XXPmXfFbzvCnLx6EkJt7lXvmUwGe/tQVytyb/ShwR8cN 9RQU2PTtEo4yBQHwue30bm2787MtmgfJ/EEqzOUylO4e3gAAhx1r89AGBvIzD4bBRz/D UD6d+1x8q8j+3isxGwJmt8Kl3eekUbmc4IzsIqQvFjU+u4kfSiV8VbzF3u4jtgnPgPPO U6fypKlqaNT0qXFFLL/oLTgvxcoqbQt3/r4ueooyO0OyUy6/tsMNzYYZ6Fg+lwn+IQwL NIlg== X-Gm-Message-State: APf1xPDB6ihyymUv6cczMqnYclOxhEdXK40/zkYsyespHfndHccdy+Li PlFFSuIPQ5cMHQ5slfbvBDWlVYKt X-Received: by 10.28.99.137 with SMTP id x131mr1580843wmb.12.1517918420553; Tue, 06 Feb 2018 04:00:20 -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.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 04:00:19 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Feb 2018 11:59:52 +0000 Message-Id: <20180206115954.1780-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206115954.1780-1-ross.burton@intel.com> References: <20180206115954.1780-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] expat: remove old workaround for expat tarball 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 Back in 2010 the expat 2.0.1 tarball wouldn't unpack correctly with old gzip releases (prior to 1.4). The fix was to explicitly depend on gzip-native to use our binary instead of the host[1]. We don't ship expat 2.0.1 anymore, and even Centos 7 ships gzip 1.5, so this workaround can be removed. [1] oe-core 0ff62b0462f3f64672bd4704de9a192eb1a730d1 Signed-off-by: Ross Burton --- meta/recipes-core/expat/expat_2.2.5.bb | 5 ----- 1 file changed, 5 deletions(-) -- 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_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb index f7a5b36ac74..bce59298e5b 100644 --- a/meta/recipes-core/expat/expat_2.2.5.bb +++ b/meta/recipes-core/expat/expat_2.2.5.bb @@ -18,11 +18,6 @@ SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d47335 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 } From patchwork Tue Feb 6 11:59:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126987 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2846902ljc; Tue, 6 Feb 2018 04:00:44 -0800 (PST) X-Google-Smtp-Source: AH8x2244MEGvBN2uHXJ5RoAkxtMZTX0j5SLpxY/SLupvPGnUOuO+9/lZiGjCeTzvc1W5GpyLYFhn X-Received: by 10.98.204.132 with SMTP id j4mr2179157pfk.161.1517918443994; Tue, 06 Feb 2018 04:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517918443; cv=none; d=google.com; s=arc-20160816; b=KlSyHjdYXRiztqZyGKQKBim0ppuqkPv43UKqM9JUtaTSP+1uQ6WPtySSO45JHSa/nr iagacPEwu2Vxr5rzmrhJgfa/AI5XSgXDIEJo+eChIxMsqgrR8Lt25ZHPlFch/0mFX/sD D+0g795IJ92WZZeR2RjdrWnomsV5cXAtaYGtiBIzhTCjNi8pcdX+5C363rQJfTZ6YH5z CLCSrl+JpqcVBg5NKnJne9jCpRV0hAod28ZFe6UW26SASa7d9Sv2Lj8NqCiitg4XQ50K eAD/PkfRFLqPA7jv37TqpUAMrCTFUN2qoHt73DNnffqOdYSsQcnmXAsujHt5g5qQI4sS EH5g== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=brK/fRDtMtn0f7IUZjiYjPBF8xRfOQ9WkBdKeqbL4vk=; b=Ma8BxOHsv1/yE5vIauywFUGjXgLG5Irofzf44u1Gap1McIMKaP3Eu/ilpwINSxNTSR YJTlrnzQIHBm+Mp6REczcJ6gS/ErNSx4YSvN2XV/tF8ZhdpEa1XMLGC9iOlEkBxlqvyQ 421elJ54VCWenLDKVlfWjSUr+6BBu0I+KfRMyG/EQu02DpQqC8utxmcqPYwusnmepeE3 WQNdaKSIAcOSXNQZBVcdw41TCiz2wnt9Aq09L8cCxdsBSNso/lP81I2GkmfaqICtzhz1 Babp0qji18bc0n+YfBkC8K+3lBnsUjPKpLUXbcaKmWl/sPQ2uaJas1hQDKzeLfuX9zE+ MpPQ== 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=lAc+U+lr; 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 f23-v6si69618pli.463.2018.02.06.04.00.43; Tue, 06 Feb 2018 04:00:43 -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=lAc+U+lr; 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 ABAB778752; Tue, 6 Feb 2018 12:00:39 +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 A6E52786B5 for ; Tue, 6 Feb 2018 12:00:20 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id j21-v6so17593795wmh.1 for ; Tue, 06 Feb 2018 04:00:22 -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:in-reply-to:references; bh=IR38tQssAZIMc150wgojXgV6CQjG/nh8BxF59h0/PWU=; b=lAc+U+lrz/TKoNKK9mh5aP20EBP+8/+O5PgJCnHGAIbjklZ44CCGoytUtqEoGRlVzq fnV54OwgaXzHUOx4S0pUPfOW6Xi+d8FvUKQKLc7Q8DW5cVX+r1RaR72t7qqDfM9t6Ews ffTg0Oe6t0x8bTK5dPzTk9EmhzRLFVqOMpCmXwLqK6unHjAX9W0F/4TbF5phhKz1Oi9k zyBEbtgObXXvdOyQ/gWK+5ZFw48CWT9CFD8HhKGI1Uth20CCkCHgpieDMwD683V4aYwc YMMK/HmHV9QwjhpK94oyr7cc7k7jqHRVKCG1o96y6HxJkBXqfW9clgMzvGc4O6TTxDRo CR6A== 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:in-reply-to :references; bh=IR38tQssAZIMc150wgojXgV6CQjG/nh8BxF59h0/PWU=; b=htV3AV+cwxEImwl400DQtAN4AD+J7JbuVKUEVqqCVm6Q2v3O2Wo4ifGflFLTaYBR8m Knldc4gEku1/sKU1qEbz2f5f+j1SLvDJ1asQqhSWXwxCgafHhKg5GEnlBFZWML9aTVx4 U6Z84d+Iw8Z0uB7XuCXXYvZ0FpmjzgQejp3GIpxTrfXBQ4GbPGCRT+xJkAPAU95WMF1C vAAUEQnldLJ/ZUKyLb0XgOMBITq9QtPwJBcCRi8U5xtjCDxtHjNfiKrcfddTHbnnE4Lk kdMzsydqcsxVMY0UuWoEZuPJ4gOj12suk1tBI2NRzsdA+ffkUUuZQRF7AtyqC694I757 B6Dg== X-Gm-Message-State: APf1xPC+35Hc+DinYXvRAtX9c0ApcujTxIGR2ry/P8iih8Gov55FsK2M C/jt/AXIUQek0yDluY04mNjXMMD1 X-Received: by 10.28.141.144 with SMTP id p138mr1799254wmd.58.1517918421569; Tue, 06 Feb 2018 04:00:21 -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.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 04:00:20 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Feb 2018 11:59:53 +0000 Message-Id: <20180206115954.1780-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206115954.1780-1-ross.burton@intel.com> References: <20180206115954.1780-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] pigz: pigz is not gzip 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 Whilst pigz is effectively a parallel gzip, the command line arguments are not the same so pigz isn't a drop-in replacement for gzip. [ YOCTO #12139 ] [ YOCTO #12410 ] Signed-off-by: Ross Burton --- meta/conf/distro/include/default-providers.inc | 1 - meta/recipes-extended/pigz/pigz_2.4.bb | 21 +-------------------- 2 files changed, 1 insertion(+), 21 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index c1cc97fccc7..e65c1ed323d 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -42,7 +42,6 @@ PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_opkg-native ?= "opkg-native" PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" -PREFERRED_PROVIDER_gzip-native ?= "pigz-native" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb index cb41154dafe..20e4154434f 100644 --- a/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.4.bb @@ -8,8 +8,6 @@ SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" -PROVIDES_class-native += "gzip-native" - SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" @@ -21,9 +19,7 @@ DEPENDS = "zlib" EXTRA_OEMAKE = "-e MAKEFLAGS=" -inherit update-alternatives - -do_install_class-target() { +do_install() { # Install files into /bin (FHS), which is typical place for gzip install -d ${D}${base_bindir} install ${B}/pigz ${D}${base_bindir}/pigz @@ -31,19 +27,4 @@ do_install_class-target() { ln -nsf pigz ${D}${base_bindir}/pigzcat } -do_install() { - install -d ${D}${bindir} - install ${B}/pigz ${D}${bindir}/gzip - ln -nsf gzip ${D}${bindir}/gunzip - ln -nsf gzip ${D}${bindir}/zcat -} - -ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_${PN} = "gunzip gzip zcat" -ALTERNATIVE_${PN}_class-nativesdk = "" -ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" -ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" -ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" -ALTERNATIVE_TARGET = "${base_bindir}/pigz" - BBCLASSEXTEND = "native nativesdk" From patchwork Tue Feb 6 11:59:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126988 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2847027ljc; Tue, 6 Feb 2018 04:00:50 -0800 (PST) X-Google-Smtp-Source: AH8x227sOZTV9TcVEQQFW4kMtZ7y1jkVzf50wfmP8ypKWZDjsiR2dffz7SwxZ1vlJGxeHS0NkIBe X-Received: by 2002:a17:902:bc01:: with SMTP id n1-v6mr2199727pls.52.1517918450784; Tue, 06 Feb 2018 04:00:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517918450; cv=none; d=google.com; s=arc-20160816; b=R3/FPU3kjds9trvnVZYeDD0G00jVj7OgnKqFA88Tl2GB13b5IhL80uvb3cfjSxqR/d yknUbMm13lyMMdIqhSMulLiqZX4KWl63+4ZNtKHIgqXZ3A90EusI3lPlKCiM5zd6l5l5 wB7kBVu5VPcULdTOA4LSc31DTOrWMO8i826wiYd+WJhMZqUq2WoXgKV92Lin87urmt3i pwwJLshVD2X/tovIV+8bA+cz29S+w5+MGgVt0DUt4KZ+YAZ8Oz1XTJXW0O7nCzOftcSD Fq5kIqOaQtbEq5Zvs0YLxviVQdzAp23/KRdSWASbfLVPXa1ixlecmuouKj7tTvuzdulh MtOA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=83pyWCJ4AbCo4JmEVqkaInb5+efPUQUmcJ9KuCsV7hU=; b=FH6GtEBasMqb642QJRvq9FCoeSc1s7W/UvMg76t/1PxL9KLQJHCorsOntKf3mZ0eTQ OqRdVQKQyAsHn8F8qHV+8nxV7sNNqqVcDtUgQio76RAyvDrq6kzzH+j2rCt6/xmTlkQt nYwWu2Q/mAFVh5uqeCzragICDfrYrPRdF4lVp64HIzYqVznhWm36Ds0cZ6eXlaO0+zxx 2tr/eghBbAILYgscd3phw+SD8hqdHSrXFp6YTAMXO5FN1cfML23WKKFz+U+Ke58GP7wB XXRCMvFf1WmK69jUVfpTeS2ZmcL17WwfHpt6F+yjOQmYL1xR2xvDf8YiATN1KsXZQElu uz3Q== 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=q+zOEIZT; 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 j11si677350pgq.634.2018.02.06.04.00.50; Tue, 06 Feb 2018 04:00:50 -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=q+zOEIZT; 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 A9C0978761; Tue, 6 Feb 2018 12:00:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by mail.openembedded.org (Postfix) with ESMTP id E8D0C71A8E for ; Tue, 6 Feb 2018 12:00:21 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id b52so1615551wrd.10 for ; Tue, 06 Feb 2018 04:00:23 -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:in-reply-to:references; bh=+AlBToGPjQt9IHBrt/9GlD0EXcTuiIStMhWS76eErrc=; b=q+zOEIZTihyah/bFN8UsbE/CHlkwyuaBiB5jTCFFvwotIFsBCb1veLJzlRts2zhht9 HMaIsSq0DT1jN1OxY9O7IgkMYYYn8QrKX7vPux0snO2m3IRyoM7EIhq2jBnAaSp38HPx hW6dAOWiZuoZFhpEMA9FXG0dDfKDjk6bjofjXrZuZ9/tItJk4M4Fn99EvJ4UM8VfZbn6 5GOTqPB00/GNhWQW9Qa7OyRETGoR/8c40RYZNk/ovCQH6kqrXKSxODZXytxTlOa0+2Kz BOpMZYm6A0fxOwcfbT5UtnygVBeWzLU/Bbl6bSsy+aESB8BVaRaNTvOB5bG75kQYDcUY GWGA== 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:in-reply-to :references; bh=+AlBToGPjQt9IHBrt/9GlD0EXcTuiIStMhWS76eErrc=; b=r/iehICyNtov4LDxoG4yl4SVzlJ7HADTyB7fKh8Muzm/7SD6r6HRWUDAIs4FDhgcm+ FCvvHAKlTL1vuWPPJDIDjj6ecZZGSVOKZ0P8SvpdzF5lxBZPo7ULHBLK+V9auUXC3dwQ eQC/I88f71hvax9yv6WxoBGgGUxc7C2el0dxxf749A8dtE3YHM8zBxCczO0/00ogrZy3 f+SceKMhweCa37pJQbWzOPq1dSp1m60JbmH6Fj4DPWNFt4pGSIOmNXvjNeMrPy6Tx1Ib mvSompRS3vAhLCyxq8oLdnv3GIeiBAdYVNBFUFjvFDVhobs6NXxjkpO0voFBJx7RaXA+ 1+dg== X-Gm-Message-State: APf1xPBTITSqa9K+3cWgpC9/Msrtde06tDHfQBPDDBGe+MucdKeBA2+k GrDSgJjlE9dZFt3ICsOAM4Bnwpg+ X-Received: by 10.223.157.6 with SMTP id k6mr2064571wre.273.1517918422499; Tue, 06 Feb 2018 04:00:22 -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.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 04:00:21 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Feb 2018 11:59:54 +0000 Message-Id: <20180206115954.1780-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206115954.1780-1-ross.burton@intel.com> References: <20180206115954.1780-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/4] pigz: use maintainer-built tarballs 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-extended/pigz/pigz_2.4.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 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-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb index 20e4154434f..6e6da9c3c56 100644 --- a/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.4.bb @@ -8,10 +8,10 @@ SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" -SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" -SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" - +SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" +SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" +SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" +# Point this at the homepage in case /fossils/ isn't updated UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" UPSTREAM_CHECK_REGEX = "pigz-(?P.*)\.tar"