summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-22 16:15:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-16 18:05:38 +0000
commita54c59f2a24904daffe51582b6863eebd071db0d (patch)
tree9daa2393a2872bff48978e1e13df0df60cdb8340 /meta
parent97df5555baae444406e222f6b6df0bdbf13bf0b8 (diff)
downloadpoky-a54c59f2a24904daffe51582b6863eebd071db0d.tar.gz
pigz: pigz is not gzip
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 ] (From OE-Core rev: 1624b7bfea7ac31c344a6cfcc7865a038e943814) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-extended/pigz/pigz_2.4.bb21
2 files changed, 1 insertions, 21 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index c1cc97fccc..e65c1ed323 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"
42PREFERRED_PROVIDER_opkg-native ?= "opkg-native" 42PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
43PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" 43PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
44PREFERRED_PROVIDER_console-tools ?= "kbd" 44PREFERRED_PROVIDER_console-tools ?= "kbd"
45PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
46PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" 45PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
47PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" 46PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
48# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb 47# 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 cb41154daf..20e4154434 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"
8LICENSE = "Zlib & Apache-2.0" 8LICENSE = "Zlib & Apache-2.0"
9LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" 9LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21"
10 10
11PROVIDES_class-native += "gzip-native"
12
13SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" 11SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
14SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f" 12SRC_URI[md5sum] = "3c8a601db141d3013ef9fe5f2daaf73f"
15SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" 13SRC_URI[sha256sum] = "e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52"
@@ -21,9 +19,7 @@ DEPENDS = "zlib"
21 19
22EXTRA_OEMAKE = "-e MAKEFLAGS=" 20EXTRA_OEMAKE = "-e MAKEFLAGS="
23 21
24inherit update-alternatives 22do_install() {
25
26do_install_class-target() {
27 # Install files into /bin (FHS), which is typical place for gzip 23 # Install files into /bin (FHS), which is typical place for gzip
28 install -d ${D}${base_bindir} 24 install -d ${D}${base_bindir}
29 install ${B}/pigz ${D}${base_bindir}/pigz 25 install ${B}/pigz ${D}${base_bindir}/pigz
@@ -31,19 +27,4 @@ do_install_class-target() {
31 ln -nsf pigz ${D}${base_bindir}/pigzcat 27 ln -nsf pigz ${D}${base_bindir}/pigzcat
32} 28}
33 29
34do_install() {
35 install -d ${D}${bindir}
36 install ${B}/pigz ${D}${bindir}/gzip
37 ln -nsf gzip ${D}${bindir}/gunzip
38 ln -nsf gzip ${D}${bindir}/zcat
39}
40
41ALTERNATIVE_PRIORITY = "80"
42ALTERNATIVE_${PN} = "gunzip gzip zcat"
43ALTERNATIVE_${PN}_class-nativesdk = ""
44ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
45ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
46ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
47ALTERNATIVE_TARGET = "${base_bindir}/pigz"
48
49BBCLASSEXTEND = "native nativesdk" 30BBCLASSEXTEND = "native nativesdk"