diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-27 00:18:55 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-07 18:52:46 +0000 |
| commit | f3edae1a8cd8ac1b2ddb5f771a99cbb2c28bb529 (patch) | |
| tree | a25062a2c17a5e41592a18c999722cec1542b83e | |
| parent | 7d10af1954aa4f27e3f32b7371a1f2454344bb5f (diff) | |
| download | openembedded-core-f3edae1a8cd8ac1b2ddb5f771a99cbb2c28bb529.tar.gz openembedded-core-f3edae1a8cd8ac1b2ddb5f771a99cbb2c28bb529.tar.bz2 openembedded-core-f3edae1a8cd8ac1b2ddb5f771a99cbb2c28bb529.zip | |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.3.12.bb | 27 | ||||
| -rw-r--r-- | meta/recipes-extended/gzip/gzip_1.6.bb | 8 |
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" HOMEPAGE = "http://www.gnu.org/software/gzip/" SECTION = "console/utils" # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -SRC_URI_append_class-target = " file://wrong-path-fix.patch" inherit autotools texinfo 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 @@ -SUMMARY = "Standard GNU compressor" -DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \ -project. Mark Adler wrote the decompression part" -HOMEPAGE = "http://www.gnu.org/software/gzip" -SECTION = "base" +require gzip.inc LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ @@ -17,24 +13,3 @@ SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" PR = "r2" - -inherit autotools - -do_install_append () { - # move files into /bin (FHS) - install -d ${D}${base_bindir} - mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip - mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip - mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat - mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress -} - -inherit update-alternatives - -ALTERNATIVE_${PN} = "gzip gunzip zcat" -ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" -ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" -ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "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 @@ require gzip.inc +LICENSE = "GPLv3+" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +SRC_URI_append_class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" + PROVIDES_append_class-native = " gzip-replacement-native" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |