diff options
Diffstat (limited to 'meta/recipes-extended/gzip')
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch) | 14 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 10 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.13.bb (renamed from meta/recipes-extended/gzip/gzip_1.10.bb) | 17 |
3 files changed, 21 insertions, 20 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch index 7c37bc8d2d..7f9e249de8 100644 --- a/meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch +++ b/meta/recipes-extended/gzip/gzip-1.13/wrong-path-fix.patch | |||
@@ -18,19 +18,19 @@ Upstream-Status: Pending | |||
18 | 1 file changed, 1 insertion(+), 2 deletions(-) | 18 | 1 file changed, 1 insertion(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/Makefile.am b/Makefile.am | 20 | diff --git a/Makefile.am b/Makefile.am |
21 | index d4ecc3f..e4657d2 100644 | 21 | index 4f51b61..80a5ddf 100644 |
22 | --- a/Makefile.am | 22 | --- a/Makefile.am |
23 | +++ b/Makefile.am | 23 | +++ b/Makefile.am |
24 | @@ -82,8 +82,7 @@ SUFFIXES = .in | 24 | @@ -93,8 +93,7 @@ SUFFIXES = .in |
25 | .in: | 25 | .in: |
26 | $(AM_V_GEN)rm -f $@-t $@ \ | 26 | $(AM_V_GEN)rm -f $@-t $@ \ |
27 | && sed \ | 27 | && sed \ |
28 | - -e 's|/bin/sh|$(SHELL)|g' \ | 28 | - -e 's|/bin/sh|$(SHELL)|g' \ |
29 | - -e 's|[@]GREP@|$(GREP)|g' \ | 29 | - -e 's|[@]GREP@|$(GREP)|g' \ |
30 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ | 30 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ |
31 | -e 's|[@]VERSION@|$(VERSION)|g' \ | 31 | -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ |
32 | $(srcdir)/$@.in >$@-t \ | 32 | -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ |
33 | && chmod a=rx $@-t \ | 33 | -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ |
34 | -- | 34 | -- |
35 | 2.7.4 | 35 | 2.7.4 |
36 | 36 | ||
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 04f8f95dd5..62b3e2f4f9 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc | |||
@@ -3,15 +3,15 @@ DESCRIPTION = "GNU Gzip is a popular data compression program originally written | |||
3 | project. Mark Adler wrote the decompression part" | 3 | project. Mark Adler wrote the decompression part" |
4 | HOMEPAGE = "http://www.gnu.org/software/gzip/" | 4 | HOMEPAGE = "http://www.gnu.org/software/gzip/" |
5 | SECTION = "console/utils" | 5 | SECTION = "console/utils" |
6 | # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 | ||
7 | 6 | ||
8 | inherit autotools texinfo | 7 | inherit autotools texinfo |
9 | export DEFS="NO_ASM" | 8 | export DEFS="NO_ASM" |
10 | 9 | ||
11 | EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" | 10 | EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" |
12 | EXTRA_OECONF_append_libc-musl = " gl_cv_func_fflush_stdin=yes " | 11 | EXTRA_OEMAKE:append:class-nativesdk = " GREP=grep" |
12 | EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " | ||
13 | 13 | ||
14 | do_install_append () { | 14 | do_install:append () { |
15 | if [ "${base_bindir}" != "${bindir}" ]; then | 15 | if [ "${base_bindir}" != "${bindir}" ]; then |
16 | # Rename and move files into /bin (FHS), which is typical place for gzip | 16 | # Rename and move files into /bin (FHS), which is typical place for gzip |
17 | install -d ${D}${base_bindir} | 17 | install -d ${D}${base_bindir} |
@@ -25,7 +25,7 @@ do_install_append () { | |||
25 | inherit update-alternatives | 25 | inherit update-alternatives |
26 | 26 | ||
27 | ALTERNATIVE_PRIORITY = "100" | 27 | ALTERNATIVE_PRIORITY = "100" |
28 | ALTERNATIVE_${PN} = "gunzip gzip zcat" | 28 | ALTERNATIVE:${PN} = "gunzip gzip zcat" |
29 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" | 29 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" |
30 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" | 30 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" |
31 | ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" | 31 | ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" |
diff --git a/meta/recipes-extended/gzip/gzip_1.10.bb b/meta/recipes-extended/gzip/gzip_1.13.bb index 9778e687e1..fd846b30a5 100644 --- a/meta/recipes-extended/gzip/gzip_1.10.bb +++ b/meta/recipes-extended/gzip/gzip_1.13.bb | |||
@@ -1,18 +1,20 @@ | |||
1 | require gzip.inc | 1 | require gzip.inc |
2 | 2 | ||
3 | LICENSE = "GPLv3+" | 3 | # change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is |
4 | # 1.3.12 | ||
5 | LICENSE = "GPL-3.0-or-later" | ||
4 | 6 | ||
5 | SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ | 7 | SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ |
6 | file://run-ptest \ | 8 | file://run-ptest \ |
7 | " | 9 | " |
8 | SRC_URI_append_class-target = " file://wrong-path-fix.patch" | 10 | SRC_URI:append:class-target = " file://wrong-path-fix.patch" |
9 | 11 | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ |
11 | file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" | 13 | file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" |
12 | 14 | ||
13 | PROVIDES_append_class-native = " gzip-replacement-native" | 15 | PROVIDES:append:class-native = " gzip-replacement-native" |
14 | 16 | ||
15 | RDEPENDS_${PN}-ptest += "make perl grep diffutils" | 17 | RDEPENDS:${PN}-ptest += "make perl grep diffutils" |
16 | 18 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
18 | 20 | ||
@@ -36,5 +38,4 @@ do_install_ptest() { | |||
36 | ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile | 38 | ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile |
37 | } | 39 | } |
38 | 40 | ||
39 | SRC_URI[md5sum] = "cf9ee51aff167ff69844d5d7d71c8b20" | 41 | SRC_URI[sha256sum] = "20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a" |
40 | SRC_URI[sha256sum] = "c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68" | ||