summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 14:29:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:28:11 +0000
commit8903327ff483cd3dbde8cf692be2092462265188 (patch)
treec16ba2b5a94aee55123290b54f1841f572039132
parentc74af4b29179fa1e6c59672803f5d69f74976dbe (diff)
downloadopenembedded-core-8903327ff483cd3dbde8cf692be2092462265188.tar.gz
openembedded-core-8903327ff483cd3dbde8cf692be2092462265188.tar.bz2
openembedded-core-8903327ff483cd3dbde8cf692be2092462265188.tar.xz
openembedded-core-8903327ff483cd3dbde8cf692be2092462265188.zip
pigz: Add update-alternatives support since this otherwise conflicts with busybox/gzip
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/pigz/pigz.inc17
-rw-r--r--meta/recipes-extended/pigz/pigz_2.2.4.bb2
2 files changed, 15 insertions, 4 deletions
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index 5fda8cabf..e1cbc8be8 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 eaf00c670..e76c49c47 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}"