pigz: Add update-alternatives support since this otherwise conflicts with busybox/gzip

(From OE-Core rev: 8903327ff483cd3dbde8cf692be2092462265188)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 15 insertions, 4 deletions

diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index 5fda8cabfb..e1cbc8be80 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -15,7 +15,18 @@ PROVIDES_virtclass-native += "gzip-native"
 DEPENDS = "zlib"
 
 do_install () {
-        install -d ${D}${bindir}
-        install ${B}/pigz ${D}${bindir}/gzip
-        install ${B}/unpigz ${D}${bindir}/gunzip
+        if [ "${PN}" = "${BPN}" ] ; then
+                # Install files into /bin (FHS), which is typical place for gzip
+                install -d ${D}${base_bindir}           
+                install ${B}/pigz ${D}${base_bindir}/gzip
+                install ${B}/unpigz ${D}${base_bindir}/gunzip
+        else
+                install -d ${D}${bindir}
+                install ${B}/pigz ${D}${bindir}/gzip
+                install ${B}/unpigz ${D}${bindir}/gunzip
+        fi
 }
+
+ALTERNATIVE_LINKS = "${base_bindir}/gzip ${base_bindir}/gunzip"
+ALTERNATIVE_PRIORITY = "80"
+
diff --git a/meta/recipes-extended/pigz/pigz_2.2.4.bb b/meta/recipes-extended/pigz/pigz_2.2.4.bb
index eaf00c6705..e76c49c475 100644
--- a/meta/recipes-extended/pigz/pigz_2.2.4.bb
+++ b/meta/recipes-extended/pigz/pigz_2.2.4.bb
@@ -1,6 +1,6 @@
 require pigz.inc
 
-PR = "r1"
+PR = "r2"
 
 NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"