Skip to contentSkip to conversation

Recipe updates

PATCH New Denys Dmytriyenko 1 participant 7 messages Feb 18, 2019

lore
Share & tools
lore
#0 lore raw

cover Recipe updates

From: Denys Dmytriyenko <[email protected]>

Update lz4, lzip, lzop, gzip, grep and hdparm to the latest.

Build-tested against qemu targets, plus x32 and musl.

The following changes since commit 93c6e5023d74bf6fae8e3a70afd9dca6b1ab555a:

glib-2.0: Improve shared-mime-info dependency handling (2019-02-18 10:33:08 +0000)

are available in the git repository at:

git://push.openembedded.org/openembedded-core-contrib denix/master

Denys Dmytriyenko (6):
lz4: upgrade 1.8.2 -> 1.8.3
lzip: upgrade 1.20 -> 1.21
hdparm: upgrade 9.56 -> 9.58
lzop: upgrade 1.03 -> 1.04
gzip: upgrade 1.9 -> 1.10
grep: upgrade 3.1 -> 3.3

 ...need_charset_alias-when-building-for-musl.patch |  33 ----
 .../grep/{grep_3.1.bb => grep_3.3.bb}              |  10 +-
 .../{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch   |   0
 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch   | 189 ---------------------
 .../gzip/{gzip_1.9.bb => gzip_1.10.bb}             |   6 +-
 .../hdparm/{hdparm_9.56.bb => hdparm_9.58.bb}      |   4 +-
 .../lzip/{lzip_1.20.bb => lzip_1.21.bb}            |   4 +-
 .../lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb}             |   2 +-
 ...inlines-as-the-external-inline-definition.patch | 100 -----------
 .../recipes-support/lzop/lzop/lzop-1.03-gcc6.patch |  37 ----
 .../lzop/lzop/x32_abi_miniacc_h.patch              |  36 ----
 .../lzop/{lzop_1.03.bb => lzop_1.04.bb}            |  11 +-
 12 files changed, 15 insertions(+), 417 deletions(-)
 delete mode 100644 meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
 rename meta/recipes-extended/grep/{grep_3.1.bb => grep_3.3.bb} (74%)
 rename meta/recipes-extended/gzip/{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch (100%)
 delete mode 100644 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
 rename meta/recipes-extended/gzip/{gzip_1.9.bb => gzip_1.10.bb} (88%)
 rename meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} (90%)
 rename meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} (88%)
 rename meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} (94%)
 delete mode 100644 meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
 delete mode 100644 meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
 delete mode 100644 meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
 rename meta/recipes-support/lzop/{lzop_1.03.bb => lzop_1.04.bb} (66%)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/6 lz4: upgrade 1.8.2 -> 1.8.3

From: Denys Dmytriyenko <[email protected]>

---
 meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/lz4/{lz4_1.8.2.bb => lz4_1.8.3.bb} (94%)
meta/recipes-support/lz4/lz4_1.8.3.bb renamed from meta/recipes-support/lz4/lz4_1.8.2.bb +1 -1
similarity index 94%
rename from meta/recipes-support/lz4/lz4_1.8.2.bb
rename to meta/recipes-support/lz4/lz4_1.8.3.bb
index 5ad17e1..125836f 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
 
 PE = "1"
 
-SRCREV = "b3692db46d2b23a7c0af2d5e69988c94f126e10a"
+SRCREV = "641b453d9db536ee020851bfcb1dc39f61006f0a"
 
 SRC_URI = "git://github.com/lz4/lz4.git \
            file://run-ptest \
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/6 lzip: upgrade 1.20 -> 1.21

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/lzip/{lzip_1.20.bb => lzip_1.21.bb} (88%)
meta/recipes-extended/lzip/lzip_1.21.bb renamed from meta/recipes-extended/lzip/lzip_1.20.bb +2 -2
similarity index 88%
rename from meta/recipes-extended/lzip/lzip_1.20.bb
rename to meta/recipes-extended/lzip/lzip_1.21.bb
index ed648e8..bb3d2a6 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
                     file://decoder.cc;beginline=3;endline=16;md5=db09fe3f9573f94d0076f7f07959e6e1"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
-SRC_URI[md5sum] = "21c1517da2ace9689fd953918660b3c3"
-SRC_URI[sha256sum] = "c93b81a5a7788ef5812423d311345ba5d3bd4f5ebf1f693911e3a13553c1290c"
+SRC_URI[md5sum] = "c0061730d017ea593a09308edc547128"
+SRC_URI[sha256sum] = "e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b"
 
 B = "${WORKDIR}/build"
 do_configure[cleandirs] = "${B}"
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/6 hdparm: upgrade 9.56 -> 9.58

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/hdparm/{hdparm_9.56.bb => hdparm_9.58.bb} (90%)
meta/recipes-extended/hdparm/hdparm_9.58.bb renamed from meta/recipes-extended/hdparm/hdparm_9.56.bb +2 -2
similarity index 90%
rename from meta/recipes-extended/hdparm/hdparm_9.56.bb
rename to meta/recipes-extended/hdparm/hdparm_9.58.bb
index 17932ad..e47deda 100644
@@ -25,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \
            file://wiper.sh-fix-stat-path.patch \
           "
 
-SRC_URI[md5sum] = "7900608e32834f65d2654fdb696e71a0"
-SRC_URI[sha256sum] = "6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da"
+SRC_URI[md5sum] = "4652c49cf096a64683c05f54b4fa4679"
+SRC_URI[sha256sum] = "9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f"
 
 EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/6 lzop: upgrade 1.03 -> 1.04

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

License checksum changed due to updated copyright year and cleanup.

3 patches for miniacc.h were incorporated upstream.

Build-tested on qemu targets, including x32.

---
 ...inlines-as-the-external-inline-definition.patch | 100 ---------------------
 .../recipes-support/lzop/lzop/lzop-1.03-gcc6.patch |  37 --------
 .../lzop/lzop/x32_abi_miniacc_h.patch              |  36 --------
 .../lzop/{lzop_1.03.bb => lzop_1.04.bb}            |  11 +--
 4 files changed, 4 insertions(+), 180 deletions(-)
 delete mode 100644 meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
 delete mode 100644 meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
 delete mode 100644 meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
 rename meta/recipes-support/lzop/{lzop_1.03.bb => lzop_1.04.bb} (66%)
meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch deleted +0 -100
deleted file mode 100644
index 867b88b..0000000
@@ -1,100 +0,0 @@
-From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 16 Aug 2015 10:35:47 -0700
-Subject: [PATCH] use static inlines as the external inline definition has
- changed with gcc5
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- src/miniacc.h | 24 ++++++++----------------
- 1 file changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/src/miniacc.h b/src/miniacc.h
-index 09e6f0c..cae98d1 100644
---- a/src/miniacc.h
-+++ b/src/miniacc.h
-@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE16)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-     __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
-     unsigned long v;
-     __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
- #define ACC_UA_GET_LE16(p)      __ACC_UA_GET_LE16(p)
- #endif
- #if !defined(ACC_UA_SET_LE16)
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-     __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
-     __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
-@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE32)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-     __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
-     unsigned long v;
-     __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
- #define ACC_UA_GET_LE32(p)      __ACC_UA_GET_LE32(p)
- #endif
- #if !defined(ACC_UA_SET_LE32)
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-     __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
-     __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
-@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE16)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
-     __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
-     unsigned long v;
-     __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
- #define ACC_UA_GET_LE16(p)      __ACC_UA_GET_LE16(p)
- #endif
- #if !defined(ACC_UA_SET_LE16)
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
-     __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
-     __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
-@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
- #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
- #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
- #if !defined(ACC_UA_GET_LE32)
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
--extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
-     __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
-     unsigned long v;
-     __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
-@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
- #define ACC_UA_GET_LE32(p)      __ACC_UA_GET_LE32(p)
- #endif
- #if !defined(ACC_UA_SET_LE32)
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
--extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
-     __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
-     __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
- }
--- 
-2.5.0
-
meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch deleted +0 -37
deleted file mode 100644
index 72b3397..0000000
@@ -1,37 +0,0 @@
-gcc-6 has additional errors e.g.
-
-./test.c:1:12: error: variably modified '__acc_cta' at file scope
- extern int __acc_cta[1-2*!((1l << (8*8 -1)) < 0)];
-            ^~~~~~~~~
-
-This is rightly pointed out since that index is undefined
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-
---- a/src/miniacc.h.orig	2016-02-10 16:09:23.247315866 +0100
-+++ a/src/miniacc.h	2016-02-10 16:12:14.973297054 +0100
-@@ -4469,12 +4469,12 @@
- #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
- #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
- #else
--    ACCCHK_ASSERT((1   << (8*SIZEOF_INT-1)) < 0)
-+    ACCCHK_ASSERT((int)(1u   << (8*SIZEOF_INT-1)) < 0)
- #endif
-     ACCCHK_ASSERT((1u  << (8*SIZEOF_INT-1)) > 0)
- #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
- #else
--    ACCCHK_ASSERT((1l  << (8*SIZEOF_LONG-1)) < 0)
-+    ACCCHK_ASSERT((long)(1ul  << (8*SIZEOF_LONG-1)) < 0)
- #endif
-     ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
- #if defined(acc_int16e_t)
-@@ -4703,7 +4703,7 @@
- #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
- #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
- #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
--    ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
-+    ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
- #endif
- #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
- #  pragma option pop
meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch deleted +0 -36
deleted file mode 100644
index 739be82..0000000
@@ -1,36 +0,0 @@
-Fix get of FLAGS register in x32 ABI,
-
-x32 ABI requires to have 64-bit variable to store FLAGS register
-instead of size_t that is 32-bit variable, this fix operand
-type mismatch when try to pop previous pushf value.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Aníbal Limón <[email protected]>
-
-Index: lzop-1.03/src/miniacc.h
-===================================================================
---- lzop-1.03.orig/src/miniacc.h
-+++ lzop-1.03/src/miniacc.h
-@@ -754,6 +754,9 @@
- #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
- #  define ACC_ARCH_AMD64            1
- #  define ACC_INFO_ARCH             "amd64"
-+#  if defined(__ILP32__)
-+#    define ACC_ARCH_AMD64_X32      1
-+#  endif
- #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
- #  define ACC_ARCH_ARM              1
- #  define ACC_ARCH_ARM_THUMB        1
-@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n
- ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
- {
- #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
-+#  if defined(ACC_ARCH_AMD64_X32)
-+    unsigned long long r;
-+#  else
-     size_t r;
-+#  endif
-     __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
-     return (int)(r >> 18) & 1;
- #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
meta/recipes-support/lzop/lzop_1.04.bb renamed from meta/recipes-support/lzop/lzop_1.03.bb +4 -7
similarity index 66%
rename from meta/recipes-support/lzop/lzop_1.03.bb
rename to meta/recipes-support/lzop/lzop_1.04.bb
index 6f09002..b50c230 100644
@@ -8,17 +8,14 @@ to gzip."
 DEPENDS += "lzo"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \
-                    file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8"
 
 SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
            file://acinclude.m4 \
-           file://x32_abi_miniacc_h.patch \
-           file://0001-use-static-inlines-as-the-external-inline-definition.patch \
-           file://lzop-1.03-gcc6.patch \
           "
-SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905"
-SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9"
+SRC_URI[md5sum] = "271eb10fde77a0a96b9cbf745e719ddf"
+SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"
 
 inherit autotools
 
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/6 gzip: upgrade 1.9 -> 1.10

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

gnulib.patch for glibc-2.28+ has been upstreamed.

---
 .../{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch   |   0
 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch   | 189 ---------------------
 .../gzip/{gzip_1.9.bb => gzip_1.10.bb}             |   6 +-
 3 files changed, 2 insertions(+), 193 deletions(-)
 rename meta/recipes-extended/gzip/{gzip-1.9 => gzip-1.10}/wrong-path-fix.patch (100%)
 delete mode 100644 meta/recipes-extended/gzip/gzip-1.9/gnulib.patch
 rename meta/recipes-extended/gzip/{gzip_1.9.bb => gzip_1.10.bb} (88%)
meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch renamed from meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
rename to meta/recipes-extended/gzip/gzip-1.10/wrong-path-fix.patch
meta/recipes-extended/gzip/gzip-1.9/gnulib.patch deleted +0 -189

189 lines not on this page · raw message

meta/recipes-extended/gzip/gzip_1.10.bb renamed from meta/recipes-extended/gzip/gzip_1.9.bb +2 -4
similarity index 88%
rename from meta/recipes-extended/gzip/gzip_1.9.bb
rename to meta/recipes-extended/gzip/gzip_1.10.bb
index 19f6586..75de970 100644
@@ -4,7 +4,6 @@ LICENSE = "GPLv3+"
 
 SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
            file://run-ptest \
-           file://gnulib.patch \
           "
 SRC_URI_append_class-target = " file://wrong-path-fix.patch"
 
@@ -35,6 +34,5 @@ do_install_ptest() {
             ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
 }
 
-SRC_URI[md5sum] = "929d6a6b832f75b28e3eeeafb30c1d9b"
-SRC_URI[sha256sum] = "5d2d3a3432ef32f24cdb060d278834507b481a75adeca18850c73592f778f6ad"
-
+SRC_URI[md5sum] = "cf9ee51aff167ff69844d5d7d71c8b20"
+SRC_URI[sha256sum] = "c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68"
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/6 grep: upgrade 3.1 -> 3.3

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

License checksum changed due to cleanup, all URLs converted to https.

need_charset_alias is no longer being used, drop the patch.

---
 ...need_charset_alias-when-building-for-musl.patch | 33 ----------------------
 .../grep/{grep_3.1.bb => grep_3.3.bb}              | 10 +++----
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
 rename meta/recipes-extended/grep/{grep_3.1.bb => grep_3.3.bb} (74%)
meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -33
deleted file mode 100644
index ba1a4ba..0000000
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
--- 
-2.1.4
-
meta/recipes-extended/grep/grep_3.3.bb renamed from meta/recipes-extended/grep/grep_3.1.bb +4 -6
similarity index 74%
rename from meta/recipes-extended/grep/grep_3.1.bb
rename to meta/recipes-extended/grep/grep_3.3.bb
index 71810dc..704a3ec 100644
@@ -3,14 +3,12 @@ HOMEPAGE = "http://savannah.gnu.org/projects/grep/"
 BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep"
 SECTION = "console/utils"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \
-           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-          "
+SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "feca7b3e7c7f4aab2b42ecbfc513b070"
-SRC_URI[sha256sum] = "db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e"
+SRC_URI[md5sum] = "05d0718a1b7cc706a4bdf8115363f1ed"
+SRC_URI[sha256sum] = "b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514"
 
 inherit autotools gettext texinfo pkgconfig
 
Signature · 1 line
2.7.4