summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 14:01:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 14:06:40 +0000
commit995a09e7bf3aee7853b17a7757cbf6cbc4edf6b8 (patch)
tree579e92229f3e1e69a189a44c475838798122f4de /meta
parentbade85eb0d840374e9b9ad98d63744446394d925 (diff)
downloadpoky-995a09e7bf3aee7853b17a7757cbf6cbc4edf6b8.tar.gz
dosfstools: Add patch to disable fat32 autoselection and behave as 2.10
It appears msdos image population and fat32 images are incompatible. This reverts to the 2.10 behaviour of defaulting to fat16 instead of using fat32 for large images, allowing image generation to work correctly. This is a workaround and a proper fix is really needed. (From OE-Core rev: c2de8d41236cf1293db9e6c69d69e8d14f55ffd1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch27
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools_2.11.bb5
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch b/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch
new file mode 100644
index 0000000000..21ebc1052c
--- /dev/null
+++ b/meta/recipes-devtools/dosfstools/dosfstools/nofat32_autoselect.patch
@@ -0,0 +1,27 @@
1FAT32 appears to be broken when used with the -d option to populate the msdos
2image. This disables the FAT32 autoselection code which means we don't get
3broken images with the -d option. It can still be enabled on the commandline
4at the users own risk. This changes us back to the 2.10 version's behaviour
5which was known to work well even with large images.
6
7Upstream Status: Inapprioriate [depends on other patches we apply]
8
9RP 2011/12/13
10
11Index: dosfstools-2.11/mkdosfs/mkdosfs.c
12===================================================================
13--- dosfstools-2.11.orig/mkdosfs/mkdosfs.c 2011-12-13 13:54:37.538509391 +0000
14+++ dosfstools-2.11/mkdosfs/mkdosfs.c 2011-12-13 13:55:10.258508631 +0000
15@@ -808,10 +808,12 @@
16 bs.media = (char) 0xf8; /* Set up the media descriptor for a hard drive */
17 bs.dir_entries[0] = (char) 0; /* Default to 512 entries */
18 bs.dir_entries[1] = (char) 2;
19+/*
20 if (!size_fat && blocks*SECTORS_PER_BLOCK > 1064960) {
21 if (verbose) printf("Auto-selecting FAT32 for large filesystem\n");
22 size_fat = 32;
23 }
24+*/
25 if (size_fat == 32) {
26 /* For FAT32, try to do the same as M$'s format command:
27 * fs size < 256M: 0.5k clusters
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
index 7d0080cdf1..66eeb7c71b 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "DOS FAT Filesystem Utilities"
7SECTION = "base" 7SECTION = "base"
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://mkdosfs/COPYING;md5=cbe67f08d6883bff587f615f0cc81aa8" 9LIC_FILES_CHKSUM = "file://mkdosfs/COPYING;md5=cbe67f08d6883bff587f615f0cc81aa8"
10PR = "r1" 10PR = "r3"
11 11
12SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ 12SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
13 file://mkdosfs-bootcode.patch \ 13 file://mkdosfs-bootcode.patch \
@@ -15,7 +15,8 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
15 file://alignment_hack.patch \ 15 file://alignment_hack.patch \
16 file://msdos_fat12_undefined.patch \ 16 file://msdos_fat12_undefined.patch \
17 file://dosfstools-msdos_fs-types.patch \ 17 file://dosfstools-msdos_fs-types.patch \
18 file://include-linux-types.patch" 18 file://include-linux-types.patch \
19 file://nofat32_autoselect.patch "
19 20
20SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" 21SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6"
21SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484" 22SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484"