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"