1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00

mtools: update to 4.0.23

Removed patches were mainstreamed.

(From OE-Core rev: 836c178cc34a98877a18540a855534a36bbe722b)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Kravchuk
2019-05-07 22:49:33 +02:00
committed by Richard Purdie
parent 4815f8847d
commit 969087c3cc
3 changed files with 2 additions and 82 deletions
@@ -1,34 +0,0 @@
From 5cc8d1f96ab6d3459e13631d8356f87381562352 Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
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 <jussi.kukkonen@intel.com>
---
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
@@ -1,44 +0,0 @@
From 5bdbfe0a63fed48104b17412854b26ee2275869a Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
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 <hongxu.jia@windriver.com>
---
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
@@ -24,14 +24,12 @@ RRECOMMENDS_${PN}_libc-glibc = "\
glibc-gconv-ibm866 \
glibc-gconv-ibm869 \
"
SRC_URI[md5sum] = "f750246a65ee6f9d2e82d10b03a0aaaf"
SRC_URI[sha256sum] = "1bc197199ea1c2c317f597879486eeb817f3199b526d94cc6841624768d910df"
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://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 \
"