summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-02 13:49:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:13:30 +0100
commit48bc62378a3705730f376ca03c2d6efe7a98d924 (patch)
tree505b77750453f306133db577fde146f51a716a46
parent309c0b639491cb0249e56dddf0e3364ea6e1bb76 (diff)
downloadpoky-48bc62378a3705730f376ca03c2d6efe7a98d924.tar.gz
mtools: Patch out a useless sanity check
The sanity check is ensuring that filesystem size is divisible by sectors-per-track. That seems to be just an optimization for ancient media, and quite tricky to accomplish as different dosfstools versions produce filesystems with different sectors-per-track. Continue processing even if filesystem size is not divisible by sectors-per-track. (From OE-Core rev: 970cdbe26d9b6d0bd93325c8e734416e679010df) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch34
-rw-r--r--meta/recipes-devtools/mtools/mtools_3.9.9.bb4
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.18.bb4
3 files changed, 40 insertions, 2 deletions
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
new file mode 100644
index 0000000000..1f8f8351c4
--- /dev/null
+++ b/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
@@ -0,0 +1,34 @@
1From 5cc8d1f96ab6d3459e13631d8356f87381562352 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 2 Jun 2016 09:49:44 +0300
4Subject: [PATCH] Continue even if fs size is not divisible by
5 sectors-per-track
6
7Filesystem with a size that is not divisible by sectors-per-track is
8not broken or invalid: it might be unoptimized on media where
9heads and cylinders actually matter but that should be it.
10
11Preserve the warning but make mtools continue even if fs size is not
12divisible by sectors-per-track.
13
14Upstream-Status: Submitted [info-mtools@gnu.org]
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16---
17 init.c | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/init.c b/init.c
21index c9152e0..4e16a01 100644
22--- a/init.c
23+++ b/init.c
24@@ -338,7 +338,6 @@ Stream_t *fs_init(char drive, int mode, int *isRop)
25 fprintf(stderr,
26 "Add mtools_skip_check=1 to your .mtoolsrc file "
27 "to skip this test\n");
28- exit(1);
29 }
30
31 /* full cylinder buffering */
32--
332.1.4
34
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index 3423917d00..2904ff4f98 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -33,7 +33,9 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz
33 file://mtools-makeinfo.patch \ 33 file://mtools-makeinfo.patch \
34 file://mtools.patch \ 34 file://mtools.patch \
35 file://no-x11.patch \ 35 file://no-x11.patch \
36 file://fix-broken-lz.patch" 36 file://fix-broken-lz.patch \
37 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
38 "
37 39
38inherit autotools texinfo 40inherit autotools texinfo
39 41
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index efde547e26..b0efc9ecfe 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
@@ -29,7 +29,9 @@ SRC_URI[sha256sum] = "59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead
29 29
30SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ 30SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
31 file://mtools-makeinfo.patch \ 31 file://mtools-makeinfo.patch \
32 file://no-x11.gplv3.patch" 32 file://no-x11.gplv3.patch \
33 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
34 "
33 35
34 36
35inherit autotools texinfo 37inherit autotools texinfo