diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-05-28 06:32:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-30 12:37:03 +0100 |
commit | 699152506c15c70d9b77cdf5afb449ed6debd825 (patch) | |
tree | 07275a37cf5569db4492990938344bcbd651a229 /meta/recipes-extended/pigz | |
parent | 762e557b3c85619a4e919daecafb337e866be40c (diff) | |
download | poky-699152506c15c70d9b77cdf5afb449ed6debd825.tar.gz |
Revert "pigz: pigz is not gzip"
This reverts commit a54c59f2a24904daffe51582b6863eebd071db0d.
The compatibility issues have since been resolved [1][2] and pigz 2.4
annoucement also states that this can be considered as a drop-in
replacemment [3] now.
[1] https://github.com/madler/pigz/commit/33c140e5fdc5cd639d1e7cc3c5e52ec016aa8a65
[2] https://github.com/madler/pigz/commit/6fda8570f633ec582ba72ea00dad2bbac825bc17
[3] https://zlib.net/pipermail/pigz-announce_zlib.net/2017-December/000028.html
(From OE-Core rev: ad1db93d134db1ec4f6d6598c9741dc13e82e1f3)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pigz')
-rw-r--r-- | meta/recipes-extended/pigz/pigz_2.4.bb | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb index 6e6da9c3c5..974c035147 100644 --- a/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.4.bb | |||
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline | |||
11 | SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" | 11 | SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" |
12 | SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" | 12 | SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" |
13 | SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" | 13 | SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" |
14 | PROVIDES_class-native += "gzip-native" | ||
15 | |||
14 | # Point this at the homepage in case /fossils/ isn't updated | 16 | # Point this at the homepage in case /fossils/ isn't updated |
15 | UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" | 17 | UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" |
16 | UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar" | 18 | UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar" |
@@ -19,7 +21,9 @@ DEPENDS = "zlib" | |||
19 | 21 | ||
20 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 22 | EXTRA_OEMAKE = "-e MAKEFLAGS=" |
21 | 23 | ||
22 | do_install() { | 24 | inherit update-alternatives |
25 | |||
26 | do_install_class-target() { | ||
23 | # Install files into /bin (FHS), which is typical place for gzip | 27 | # Install files into /bin (FHS), which is typical place for gzip |
24 | install -d ${D}${base_bindir} | 28 | install -d ${D}${base_bindir} |
25 | install ${B}/pigz ${D}${base_bindir}/pigz | 29 | install ${B}/pigz ${D}${base_bindir}/pigz |
@@ -27,4 +31,19 @@ do_install() { | |||
27 | ln -nsf pigz ${D}${base_bindir}/pigzcat | 31 | ln -nsf pigz ${D}${base_bindir}/pigzcat |
28 | } | 32 | } |
29 | 33 | ||
34 | do_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 | |||
41 | ALTERNATIVE_PRIORITY = "80" | ||
42 | ALTERNATIVE_${PN} = "gunzip gzip zcat" | ||
43 | ALTERNATIVE_${PN}_class-nativesdk = "" | ||
44 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" | ||
45 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" | ||
46 | ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" | ||
47 | ALTERNATIVE_TARGET = "${base_bindir}/pigz" | ||
48 | |||
30 | BBCLASSEXTEND = "native nativesdk" | 49 | BBCLASSEXTEND = "native nativesdk" |