From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 8 Feb 2021 10:59:29 +0000 (+0100)
Subject: tar: update 1.32 -> 1.33
X-Git-Tag: uninative-3.0~25
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9ac95af964876752e7dae819f5b678ae4b510064;p=openembedded-core.git

tar: update 1.32 -> 1.33

Drop musl fix as upstream fixed the issue.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/tar/tar/musl_dirent.patch b/meta/recipes-extended/tar/tar/musl_dirent.patch
deleted file mode 100644
index 2d98ed1310..0000000000
--- a/meta/recipes-extended/tar/tar/musl_dirent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-musl has valid d_ino implementation
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: tar-1.28/m4/d-ino.m4
-===================================================================
---- tar-1.28.orig/m4/d-ino.m4
-+++ tar-1.28/m4/d-ino.m4
-@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_
-            [gl_cv_struct_dirent_d_ino=no],
-            [case "$host_os" in
-                            # Guess yes on glibc systems with Linux kernel.
--              linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
-+              linux*-gnu*|linux*-musl*)
-+                           gl_cv_struct_dirent_d_ino="guessing yes" ;;
-                            # Guess no on native Windows.
-               mingw*)      gl_cv_struct_dirent_d_ino="guessing no" ;;
-                            # If we don't know, assume the worst.
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.33.bb
similarity index 88%
rename from meta/recipes-extended/tar/tar_1.32.bb
rename to meta/recipes-extended/tar/tar_1.33.bb
index ebe6cb0dbd..5e34cdf9e5 100644
--- a/meta/recipes-extended/tar/tar_1.32.bb
+++ b/meta/recipes-extended/tar/tar_1.33.bb
@@ -6,12 +6,9 @@ SECTION = "base"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
-           file://musl_dirent.patch \
-"
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05"
-SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
+SRC_URI[sha256sum] = "85b6953f4bc9666eb7db61b48f150dca21b941d85090171ea8c4f89902e460af"
 
 inherit autotools gettext texinfo