Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
duo-buildroot-sdk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
duo-buildroot-sdk
Commits
bb782c05
Commit
bb782c05
authored
Jul 05, 2023
by
carbon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buildroot: drop '-b' from mcopy
parent
3d25af3f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
59 additions
and
0 deletions
+59
-0
buildroot-2021.05/package/genimage/0001-image-vfat-drop-b-from-mcopy.patch
.../package/genimage/0001-image-vfat-drop-b-from-mcopy.patch
+59
-0
No files found.
buildroot-2021.05/package/genimage/0001-image-vfat-drop-b-from-mcopy.patch
0 → 100644
View file @
bb782c05
From fe74ea1583cb6e2ae7d45acf35bb1bec39d400de Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Sat, 10 Apr 2021 11:51:48 +0200
Subject: [PATCH] image-vfat: drop '-b' from mcopy
It enables the 'Batch mode'. It is optimized for huge recursive copies. This is not
really needed here and fsck.vfat complains about the resulting filesystem.
So drop the option and expand the existing test. Fail if fsck.vfat modifies the
filesystem.
Fixes #142
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
image-vfat.c | 4 ++--
test/basic-images.test | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/image-vfat.c b/image-vfat.c
index 9f04c57..ed87b7f 100644
--- a/image-vfat.c
+++ b/image-vfat.c
@@ -62,7 +62,7 @@
static int vfat_generate(struct image *image)
image_info(image, "adding file '%s' as '%s' ...\n",
child->file, *target ? target : child->file);
- ret = systemp(image, "MTOOLS_SKIP_CHECK=1 %s -bsp -i '%s' '%s' '::%s'",
+ ret = systemp(image, "MTOOLS_SKIP_CHECK=1 %s -sp -i '%s' '%s' '::%s'",
get_opt("mcopy"), imageoutfile(image),
file, target);
if (ret)
@@ -72,7 +72,7 @@
static int vfat_generate(struct image *image)
return 0;
if (!image->empty)
- ret = systemp(image, "MTOOLS_SKIP_CHECK=1 %s -bsp -i '%s' '%s'/* ::",
+ ret = systemp(image, "MTOOLS_SKIP_CHECK=1 %s -sp -i '%s' '%s'/* ::",
get_opt("mcopy"), imageoutfile(image), mountpath(image));
return ret;
}
diff --git a/test/basic-images.test b/test/basic-images.test
index 1c96e1a..9888f49 100755
--- a/test/basic-images.test
+++ b/test/basic-images.test
@@ -343,7 +343,9 @@
exec_test_set_prereq mkdosfs
exec_test_set_prereq mcopy
test_expect_success dd,mkdosfs,mcopy "vfat" "
run_genimage vfat.config test.vfat &&
- check_size images/test.vfat 4193280
+ fsck.fat -p images/test.vfat | tee fsck.log &&
+ test_must_fail grep -q 'Filesystem was changed' fsck.log &&
+ check_size images/test.vfat 4193280 &&
MTOOLS_SKIP_CHECK=1 mdir -/ -f -b -i images/test.vfat / | sed -e 's;^::/;;' -e 's;/$;;' | sort > '${filelist_test}' &&
check_filelist
"
--
2.25.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment