From 836c178cc34a98877a18540a855534a36bbe722b Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Tue, 7 May 2019 22:49:33 +0200 Subject: mtools: update to 4.0.23 Removed patches were mainstreamed. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Richard Purdie --- ...en-if-fs-size-is-not-divisible-by-sectors.patch | 34 -------------- ...01-remove-LOCK_NB-to-use-blocking-request.patch | 44 ------------------ meta/recipes-devtools/mtools/mtools_4.0.19.bb | 53 ---------------------- meta/recipes-devtools/mtools/mtools_4.0.23.bb | 51 +++++++++++++++++++++ 4 files changed, 51 insertions(+), 131 deletions(-) delete mode 100644 meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch delete mode 100644 meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch delete mode 100644 meta/recipes-devtools/mtools/mtools_4.0.19.bb create mode 100644 meta/recipes-devtools/mtools/mtools_4.0.23.bb (limited to 'meta') diff --git a/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch b/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch deleted file mode 100644 index 1f8f8351c4..0000000000 --- a/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5cc8d1f96ab6d3459e13631d8356f87381562352 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 2 Jun 2016 09:49:44 +0300 -Subject: [PATCH] Continue even if fs size is not divisible by - sectors-per-track - -Filesystem with a size that is not divisible by sectors-per-track is -not broken or invalid: it might be unoptimized on media where -heads and cylinders actually matter but that should be it. - -Preserve the warning but make mtools continue even if fs size is not -divisible by sectors-per-track. - -Upstream-Status: Submitted [info-mtools@gnu.org] -Signed-off-by: Jussi Kukkonen ---- - init.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/init.c b/init.c -index c9152e0..4e16a01 100644 ---- a/init.c -+++ b/init.c -@@ -338,7 +338,6 @@ Stream_t *fs_init(char drive, int mode, int *isRop) - fprintf(stderr, - "Add mtools_skip_check=1 to your .mtoolsrc file " - "to skip this test\n"); -- exit(1); - } - - /* full cylinder buffering */ --- -2.1.4 - diff --git a/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch b/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch deleted file mode 100644 index 47385a582b..0000000000 --- a/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5bdbfe0a63fed48104b17412854b26ee2275869a Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 22 Aug 2018 16:54:39 +0800 -Subject: [PATCH] remove LOCK_NB to use blocking request - -While invoking mtools frequently, the unblocking request -caused race issue. Here is an example of syslinux -[snip] -dd if=/dev/zero of=floppy.img bs=1024 count=144 -losetup /dev/loop1 floppy.img -mkdosfs /dev/loop1 -syslinux -i /dev/loop1 -|plain floppy: device "/proc/6351/fd/3" busy (Resource temporarily unavailable): -|Cannot initialize 'S:' -|Bad target s:/ldlinux.sys -[snip] - -The idea is from: -https://bugzilla.redhat.com/show_bug.cgi?id=1235016 -https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - lockdev.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lockdev.h b/lockdev.h -index 4467bc2..5a135ad 100644 ---- a/lockdev.h -+++ b/lockdev.h -@@ -43,7 +43,7 @@ int lock_dev(int fd, int mode, struct device *dev) - return 0; - - #if (defined(HAVE_FLOCK) && defined (LOCK_EX) && defined(LOCK_NB)) -- if (flock(fd, (mode ? LOCK_EX : LOCK_SH)|LOCK_NB) < 0) -+ if (flock(fd, (mode ? LOCK_EX : LOCK_SH)) < 0) - #else /* FLOCK */ - - #if (defined(HAVE_LOCKF) && defined(F_TLOCK)) --- -2.7.4 - diff --git a/meta/recipes-devtools/mtools/mtools_4.0.19.bb b/meta/recipes-devtools/mtools/mtools_4.0.19.bb deleted file mode 100644 index 7d59d93a81..0000000000 --- a/meta/recipes-devtools/mtools/mtools_4.0.19.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Utilities to access MS-DOS disks without mounting them" -DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them." -HOMEPAGE = "http://www.gnu.org/software/mtools/" -SECTION = "optional" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS += "virtual/libiconv" - -RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850" -RRECOMMENDS_${PN}_libc-glibc = "\ - glibc-gconv-ibm437 \ - glibc-gconv-ibm737 \ - glibc-gconv-ibm775 \ - glibc-gconv-ibm851 \ - glibc-gconv-ibm852 \ - glibc-gconv-ibm855 \ - glibc-gconv-ibm857 \ - glibc-gconv-ibm860 \ - glibc-gconv-ibm861 \ - glibc-gconv-ibm862 \ - glibc-gconv-ibm863 \ - glibc-gconv-ibm865 \ - glibc-gconv-ibm866 \ - glibc-gconv-ibm869 \ - " -SRC_URI[md5sum] = "f750246a65ee6f9d2e82d10b03a0aaaf" -SRC_URI[sha256sum] = "1bc197199ea1c2c317f597879486eeb817f3199b526d94cc6841624768d910df" - -SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ - file://mtools-makeinfo.patch \ - file://no-x11.gplv3.patch \ - file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ - file://0001-remove-LOCK_NB-to-use-blocking-request.patch \ - file://clang_UNUSED.patch \ - " - -SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" - -inherit autotools texinfo distro_features_check - -EXTRA_OECONF = "--without-x" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd" - -do_install_prepend () { - # Create bindir to fix parallel installation issues - mkdir -p ${D}/${bindir} - mkdir -p ${D}/${datadir} -} diff --git a/meta/recipes-devtools/mtools/mtools_4.0.23.bb b/meta/recipes-devtools/mtools/mtools_4.0.23.bb new file mode 100644 index 0000000000..2ae69797a4 --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools_4.0.23.bb @@ -0,0 +1,51 @@ +SUMMARY = "Utilities to access MS-DOS disks without mounting them" +DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them." +HOMEPAGE = "http://www.gnu.org/software/mtools/" +SECTION = "optional" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS += "virtual/libiconv" + +RDEPENDS_${PN}_libc-glibc = "glibc-gconv-ibm850" +RRECOMMENDS_${PN}_libc-glibc = "\ + glibc-gconv-ibm437 \ + glibc-gconv-ibm737 \ + glibc-gconv-ibm775 \ + glibc-gconv-ibm851 \ + glibc-gconv-ibm852 \ + glibc-gconv-ibm855 \ + glibc-gconv-ibm857 \ + glibc-gconv-ibm860 \ + glibc-gconv-ibm861 \ + glibc-gconv-ibm862 \ + glibc-gconv-ibm863 \ + glibc-gconv-ibm865 \ + glibc-gconv-ibm866 \ + glibc-gconv-ibm869 \ + " +SRC_URI[md5sum] = "1d17b58c53a46b29c7f521d4a55ccef1" +SRC_URI[sha256sum] = "f188db26751aeb5692a79b2380b440ecc05fd1848a52f869d7ca1193f2ef8ee3" + +SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ + file://mtools-makeinfo.patch \ + file://no-x11.gplv3.patch \ + file://clang_UNUSED.patch \ + " + +SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" + +inherit autotools texinfo distro_features_check + +EXTRA_OECONF = "--without-x" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd" + +do_install_prepend () { + # Create bindir to fix parallel installation issues + mkdir -p ${D}/${bindir} + mkdir -p ${D}/${datadir} +} -- cgit 1.2.3-korg