summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 14:29:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:29:56 (GMT)
commitd95f6d0e325681aac083a3688800b3e92e9e55a1 (patch)
treed66d8d88ba7876ab10d66dcf7f8def4245ac34af /meta
parent7bbb8930d5532e7e9be14651fe85d38776e7f8c2 (diff)
downloadpoky-d95f6d0e325681aac083a3688800b3e92e9e55a1.tar.gz
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>
Diffstat (limited to 'meta')
-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 5fda8ca..e1cbc8b 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -15,7 +15,18 @@ PROVIDES_virtclass-native += "gzip-native"
15DEPENDS = "zlib" 15DEPENDS = "zlib"
16 16
17do_install () { 17do_install () {
18 install -d ${D}${bindir} 18 if [ "${PN}" = "${BPN}" ] ; then
19 install ${B}/pigz ${D}${bindir}/gzip 19 # Install files into /bin (FHS), which is typical place for gzip
20 install ${B}/unpigz ${D}${bindir}/gunzip 20 install -d ${D}${base_bindir}
21 install ${B}/pigz ${D}${base_bindir}/gzip
22 install ${B}/unpigz ${D}${base_bindir}/gunzip
23 else
24 install -d ${D}${bindir}
25 install ${B}/pigz ${D}${bindir}/gzip
26 install ${B}/unpigz ${D}${bindir}/gunzip
27 fi
21} 28}
29
30ALTERNATIVE_LINKS = "${base_bindir}/gzip ${base_bindir}/gunzip"
31ALTERNATIVE_PRIORITY = "80"
32
diff --git a/meta/recipes-extended/pigz/pigz_2.2.4.bb b/meta/recipes-extended/pigz/pigz_2.2.4.bb
index eaf00c6..e76c49c 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 @@
1require pigz.inc 1require pigz.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" 5NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
6 6