[3/4] pigz: pigz is not gzip

Message ID 20180206115954.1780-3-ross.burton@intel.com
State Accepted
Commit 1624b7bfea7ac31c344a6cfcc7865a038e943814
Headers show
Series
  • [1/4] expat: merge bb and inc
Related show

Commit Message

Ross Burton Feb. 6, 2018, 11:59 a.m.
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 <ross.burton@intel.com>

---
 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

Patch

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"