[oe-commits] Andreas Oberritter : pigz: fix alternatives handling, use symlinks, provide zcat

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5017ff434130c62fabb42f8224fb246801f13d0c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5017ff434130c62fabb42f8224fb246801f13d0c

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Mon Mar 23 16:34:17 2015 +0100

pigz: fix alternatives handling, use symlinks, provide zcat

The installed unpigz is a hardlink to pigz.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/pigz/pigz.inc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index b5caa95..c271f70 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -13,20 +13,26 @@ PROVIDES_class-native += "gzip-native"
 
 DEPENDS = "zlib"
 
+inherit update-alternatives
+
 do_install_class-target() {
 	# 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
+	install ${B}/pigz ${D}${base_bindir}/pigz
+	ln -nsf pigz ${D}${base_bindir}/unpigz
+	ln -nsf pigz ${D}${base_bindir}/pigzcat
 }
 
 do_install() {
 	install -d ${D}${bindir}
 	install ${B}/pigz ${D}${bindir}/gzip
-	install ${B}/unpigz ${D}${bindir}/gunzip
+	ln -nsf gzip ${D}${bindir}/gunzip
+	ln -nsf gzip ${D}${bindir}/zcat
 }
 
-ALTERNATIVE_${PN} = "gzip gunzip"
-ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
-ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
 ALTERNATIVE_PRIORITY = "80"
+ALTERNATIVE_${PN} = "gunzip gzip zcat"
+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"