From b85d2a236c114142772f190fd43ac0a08d9c39fb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 8 Feb 2021 11:59:29 +0100 Subject: tar: update 1.32 -> 1.33 Drop musl fix as upstream fixed the issue. (From OE-Core rev: 9ac95af964876752e7dae819f5b678ae4b510064) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-extended/tar/tar/musl_dirent.patch | 19 ------- meta/recipes-extended/tar/tar_1.32.bb | 66 ------------------------- meta/recipes-extended/tar/tar_1.33.bb | 63 +++++++++++++++++++++++ 3 files changed, 63 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-extended/tar/tar/musl_dirent.patch delete mode 100644 meta/recipes-extended/tar/tar_1.32.bb create mode 100644 meta/recipes-extended/tar/tar_1.33.bb (limited to 'meta/recipes-extended/tar') 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 -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.32.bb deleted file mode 100644 index ebe6cb0dbd..0000000000 --- a/meta/recipes-extended/tar/tar_1.32.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "GNU file archiving program" -DESCRIPTION = "GNU tar saves many files together into a single tape \ -or disk archive, and can restore individual files from the archive." -HOMEPAGE = "http://www.gnu.org/software/tar/" -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[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05" -SRC_URI[sha256sum] = "e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566" - -inherit autotools gettext texinfo - -PACKAGECONFIG ??= "" -PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" - -PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" - -EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" - -CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" - -# Let aclocal use the relative path for the m4 file rather than the -# absolute since tar has a lot of m4 files, otherwise there might -# be an "Argument list too long" error when it is built in a long/deep -# directory. -acpaths = "-I ./m4" - -do_install () { - autotools_do_install - ln -s tar ${D}${bindir}/gtar -} - -do_install_append_class-target() { - if [ "${base_bindir}" != "${bindir}" ]; then - install -d ${D}${base_bindir} - mv ${D}${bindir}/tar ${D}${base_bindir}/tar - mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar - rmdir ${D}${bindir}/ - fi -} - -PACKAGES =+ "${PN}-rmt" - -FILES_${PN}-rmt = "${sbindir}/rmt*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "tar" -ALTERNATIVE_${PN}-rmt = "rmt" -ALTERNATIVE_${PN}_class-nativesdk = "" -ALTERNATIVE_${PN}-rmt_class-nativesdk = "" - -ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" -ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" - -PROVIDES_append_class-native = " tar-replacement-native" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/tar/tar_1.33.bb b/meta/recipes-extended/tar/tar_1.33.bb new file mode 100644 index 0000000000..5e34cdf9e5 --- /dev/null +++ b/meta/recipes-extended/tar/tar_1.33.bb @@ -0,0 +1,63 @@ +SUMMARY = "GNU file archiving program" +DESCRIPTION = "GNU tar saves many files together into a single tape \ +or disk archive, and can restore individual files from the archive." +HOMEPAGE = "http://www.gnu.org/software/tar/" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" + +SRC_URI[sha256sum] = "85b6953f4bc9666eb7db61b48f150dca21b941d85090171ea8c4f89902e460af" + +inherit autotools gettext texinfo + +PACKAGECONFIG ??= "" +PACKAGECONFIG_append_class-target = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" + +PACKAGECONFIG[acl] = "--with-posix-acls,--without-posix-acls,acl" + +EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" + +CACHED_CONFIGUREVARS += "tar_cv_path_RSH=no" + +# Let aclocal use the relative path for the m4 file rather than the +# absolute since tar has a lot of m4 files, otherwise there might +# be an "Argument list too long" error when it is built in a long/deep +# directory. +acpaths = "-I ./m4" + +do_install () { + autotools_do_install + ln -s tar ${D}${bindir}/gtar +} + +do_install_append_class-target() { + if [ "${base_bindir}" != "${bindir}" ]; then + install -d ${D}${base_bindir} + mv ${D}${bindir}/tar ${D}${base_bindir}/tar + mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar + rmdir ${D}${bindir}/ + fi +} + +PACKAGES =+ "${PN}-rmt" + +FILES_${PN}-rmt = "${sbindir}/rmt*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "tar" +ALTERNATIVE_${PN}-rmt = "rmt" +ALTERNATIVE_${PN}_class-nativesdk = "" +ALTERNATIVE_${PN}-rmt_class-nativesdk = "" + +ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" +ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" + +PROVIDES_append_class-native = " tar-replacement-native" +NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf