]> code.ossystems Code Review - openembedded-core.git/commitdiff
pigz: fix alternatives handling, use symlinks, provide zcat
authorAndreas Oberritter <obi@opendreambox.org>
Mon, 23 Mar 2015 15:34:17 +0000 (16:34 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Mar 2015 17:52:40 +0000 (17:52 +0000)
The installed unpigz is a hardlink to pigz.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/pigz/pigz.inc

index b5caa9518416da547e3652ba0980ff198941ab84..c271f701593c60402b8790288273307fed5dd168 100644 (file)
@@ -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"