summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-27 00:18:55 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:28 +0000
commit1f9b7826613f9ad7ffee9720c21a18022cff02fd (patch)
treee0831674f2a792cc42ad74983edc53750995ec52 /meta/recipes-extended
parent8f2bda74e757c27194bdeec061f5f4df551d366b (diff)
downloadpoky-1f9b7826613f9ad7ffee9720c21a18022cff02fd.tar.gz
gzip 1.3.12: a few fixes
* Let gzip_1.3.12.bb and gzip_1.6.bb use gzip.inc to remove duplicated code. * Fixed for gzip_1.3.12.bb: WARNING: QA Issue: gzip requires /bin/bash, but no providers in its RDEPENDS [file-rdeps] * Remove native extend from gzip_1.3.12.bb, keep gzip_1.6.bb's. (From OE-Core rev: f3edae1a8cd8ac1b2ddb5f771a99cbb2c28bb529) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/gzip/gzip.inc6
-rw-r--r--meta/recipes-extended/gzip/gzip_1.3.12.bb27
-rw-r--r--meta/recipes-extended/gzip/gzip_1.6.bb8
3 files changed, 9 insertions, 32 deletions
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index b90856e796..94480ec530 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -4,12 +4,6 @@ project. Mark Adler wrote the decompression part"
4HOMEPAGE = "http://www.gnu.org/software/gzip/" 4HOMEPAGE = "http://www.gnu.org/software/gzip/"
5SECTION = "console/utils" 5SECTION = "console/utils"
6# change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 6# change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12
7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
9 file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e"
10
11SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
12SRC_URI_append_class-target = " file://wrong-path-fix.patch"
13 7
14inherit autotools texinfo 8inherit autotools texinfo
15 9
diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index 45a33ffdd1..e4062827bd 100644
--- a/meta/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
@@ -1,8 +1,4 @@
1SUMMARY = "Standard GNU compressor" 1require gzip.inc
2DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \
3project. Mark Adler wrote the decompression part"
4HOMEPAGE = "http://www.gnu.org/software/gzip"
5SECTION = "base"
6 2
7LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
@@ -17,24 +13,3 @@ SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1"
17SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" 13SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af"
18 14
19PR = "r2" 15PR = "r2"
20
21inherit autotools
22
23do_install_append () {
24 # move files into /bin (FHS)
25 install -d ${D}${base_bindir}
26 mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip
27 mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip
28 mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat
29 mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress
30}
31
32inherit update-alternatives
33
34ALTERNATIVE_${PN} = "gzip gunzip zcat"
35ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
36ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
37ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
38ALTERNATIVE_PRIORITY = "100"
39
40BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/meta/recipes-extended/gzip/gzip_1.6.bb
index 9c728dff5a..b347f0bb8d 100644
--- a/meta/recipes-extended/gzip/gzip_1.6.bb
+++ b/meta/recipes-extended/gzip/gzip_1.6.bb
@@ -1,5 +1,13 @@
1require gzip.inc 1require gzip.inc
2 2
3LICENSE = "GPLv3+"
4
5SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
6SRC_URI_append_class-target = " file://wrong-path-fix.patch"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
9 file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e"
10
3PROVIDES_append_class-native = " gzip-replacement-native" 11PROVIDES_append_class-native = " gzip-replacement-native"
4NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" 12NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
5 13