diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-devtools/mtools/mtools | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-devtools/mtools/mtools')
3 files changed, 13 insertions, 82 deletions
diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch b/external/poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch deleted file mode 100644 index 1f8f8351..00000000 --- a/external/poky/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 <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 - diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch b/external/poky/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch deleted file mode 100644 index 47385a58..00000000 --- a/external/poky/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 <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 - diff --git a/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index 01455f10..464ccc4c 100644 --- a/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/external/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,12 +1,21 @@ -Disabled reading host configs. +From 5c24356762bc4274d3ca4930b0bc7754f4ffd19b Mon Sep 17 00:00:00 2001 +From: Ed Bartosh <ed.bartosh@linux.intel.com> +Date: Tue, 13 Jun 2017 14:55:52 +0300 +Subject: [PATCH] Disabled reading host configs. Upstream-Status: Inappropriate [native] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> ---- mtools-4.0.18/config.c.orig 2017-06-13 12:27:38.644000000 +0300 -+++ mtools-4.0.18/config.c 2017-06-13 12:28:47.576000000 +0300 -@@ -701,14 +701,6 @@ +--- + config.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/config.c b/config.c +index f086883..1c3f9bd 100644 +--- a/config.c ++++ b/config.c +@@ -701,14 +701,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); |