summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-08 11:59:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-09 08:56:10 +0000
commitb85d2a236c114142772f190fd43ac0a08d9c39fb (patch)
tree7c6ecd42104733a81157a1af7332bbd21728b354
parent95204ac0523705efc3ffeb0c3ef3023cf92d411b (diff)
downloadpoky-b85d2a236c114142772f190fd43ac0a08d9c39fb.tar.gz
tar: update 1.32 -> 1.33
Drop musl fix as upstream fixed the issue. (From OE-Core rev: 9ac95af964876752e7dae819f5b678ae4b510064) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/tar/tar/musl_dirent.patch19
-rw-r--r--meta/recipes-extended/tar/tar_1.33.bb (renamed from meta/recipes-extended/tar/tar_1.32.bb)7
2 files changed, 2 insertions, 24 deletions
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 @@
1musl has valid d_ino implementation
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: tar-1.28/m4/d-ino.m4
7===================================================================
8--- tar-1.28.orig/m4/d-ino.m4
9+++ tar-1.28/m4/d-ino.m4
10@@ -40,7 +40,8 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_
11 [gl_cv_struct_dirent_d_ino=no],
12 [case "$host_os" in
13 # Guess yes on glibc systems with Linux kernel.
14- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;;
15+ linux*-gnu*|linux*-musl*)
16+ gl_cv_struct_dirent_d_ino="guessing yes" ;;
17 # Guess no on native Windows.
18 mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;;
19 # 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
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"
6LICENSE = "GPLv3" 6LICENSE = "GPLv3"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
8 8
9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ 9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
10 file://musl_dirent.patch \
11"
12 10
13SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05" 11SRC_URI[sha256sum] = "85b6953f4bc9666eb7db61b48f150dca21b941d85090171ea8c4f89902e460af"
14SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
15 12
16inherit autotools gettext texinfo 13inherit autotools gettext texinfo
17 14