diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2019-06-12 19:48:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-14 22:48:22 +0100 |
commit | 2510f1c2e85d624bb326600277a7ba37bbb94bb0 (patch) | |
tree | 83002eefb4281a5c66efb75de92831e3d11780fa | |
parent | 6f7eaf80f71aa17124c7f0be8f52902a5194ca7b (diff) | |
download | poky-2510f1c2e85d624bb326600277a7ba37bbb94bb0.tar.gz |
pigz: install pigz, unpigz, pigzcat in native and nativesdk builds again
* since this commit:
commit ad1db93d134db1ec4f6d6598c9741dc13e82e1f3
Author: Anuj Mittal <anuj.mittal@intel.com>
Date: Tue May 28 06:32:10 2019 +0800
Subject: Revert "pigz: pigz is not gzip"
pigz-native and nativesdk-pigz no longer installs pigz, unpigz, pigzcat,
so scripts explicitly depending on pigz-native and calling pigz started to fail.
* reverse the logic
- all the builds install pigz, unpigz, pigzcat
- only the native one installs it as gzip as well
* it could be optimized a bit more to create gzip as just a symlink
in native case as well, but they are in different directories
(pigz in base_bindir and gzip in bindir) and it's only 130kB..
(From OE-Core rev: 112deafd1c144d770b6ec0953911f2adc1cb30dd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/pigz/pigz_2.4.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb index 974c035147..6d62ce6cc5 100644 --- a/meta/recipes-extended/pigz/pigz_2.4.bb +++ b/meta/recipes-extended/pigz/pigz_2.4.bb | |||
@@ -23,7 +23,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" | |||
23 | 23 | ||
24 | inherit update-alternatives | 24 | inherit update-alternatives |
25 | 25 | ||
26 | do_install_class-target() { | 26 | do_install() { |
27 | # Install files into /bin (FHS), which is typical place for gzip | 27 | # Install files into /bin (FHS), which is typical place for gzip |
28 | install -d ${D}${base_bindir} | 28 | install -d ${D}${base_bindir} |
29 | install ${B}/pigz ${D}${base_bindir}/pigz | 29 | install ${B}/pigz ${D}${base_bindir}/pigz |
@@ -31,7 +31,7 @@ do_install_class-target() { | |||
31 | ln -nsf pigz ${D}${base_bindir}/pigzcat | 31 | ln -nsf pigz ${D}${base_bindir}/pigzcat |
32 | } | 32 | } |
33 | 33 | ||
34 | do_install() { | 34 | do_install_append_class-native() { |
35 | install -d ${D}${bindir} | 35 | install -d ${D}${bindir} |
36 | install ${B}/pigz ${D}${bindir}/gzip | 36 | install ${B}/pigz ${D}${bindir}/gzip |
37 | ln -nsf gzip ${D}${bindir}/gunzip | 37 | ln -nsf gzip ${D}${bindir}/gunzip |