package/mtd: add upstream patch that fixes ubiformat return code
PATCH 1/1 package/mtd: add upstream patch that fixes ubiformat return code
From: Thomas De Schampheleire <[email protected]>
ubiformat returns 255 even on successful format actions, since the upgrade of mtd-utils to version 2.1.1.
Backport an upstream patch that fixes this issue. No new release is made yet.
--- ...-utils-Fix-return-value-of-ubiformat.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch
package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch new file +60 -0
@@ -0,0 +1,60 @@ +From 95633c4dfe943a701d4fcd809e6cabf4bf8710b8 Mon Sep 17 00:00:00 2001 +From: Barry Grussling <[email protected]> +Date: Sun, 12 Jan 2020 12:33:32 -0800 +Subject: [PATCH] mtd-utils: Fix return value of ubiformat + +This changeset fixes a feature regression in ubiformat. Older versions of +ubiformat, when invoked with a flash-image, would return 0 in the case no error +was encountered. Upon upgrading to latest, it was discovered that ubiformat +returned 255 even without encountering an error condition. + +This changeset corrects the above issue and causes ubiformat, when given an +image file, to return 0 when no errors are detected. + +Tested by running through my loading scripts and verifying ubiformat returned +0. + +Signed-off-by: Barry Grussling <[email protected]> +Signed-off-by: David Oberhollenzer <[email protected]> +[import into Buildroot] +Signed-off-by: Thomas De Schampheleire <[email protected]> +--- + ubi-utils/ubiformat.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c +index 64afad2..be40e52 100644 +--- a/ubi-utils/ubiformat.c ++++ b/ubi-utils/ubiformat.c +@@ -550,6 +550,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + struct ubi_vtbl_record *vtbl; + int eb1 = -1, eb2 = -1; + long long ec1 = -1, ec2 = -1; ++ int ret = -1; + + write_size = UBI_EC_HDR_SIZE + mtd->subpage_size - 1; + write_size /= mtd->subpage_size; +@@ -643,8 +644,10 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + if (!args.quiet && !args.verbose) + printf("\n"); + +- if (novtbl) ++ if (novtbl) { ++ ret = 0; + goto out_free; ++ } + + if (eb1 == -1 || eb2 == -1) { + errmsg("no eraseblocks for volume table"); +@@ -669,7 +672,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + + out_free: + free(hdr); +- return -1; ++ return ret; + } + + int main(int argc, char * const argv[]) +-- +2.24.1 +
Signature · 1 line
2.24.1
PATCH 1/1 package/mtd: add upstream patch that fixes ubiformat return code
El mar., 7 abr. 2020 a las 11:58, Thomas De Schampheleire (<[email protected]>) escribi?:
Quoted 82 lines
From: Thomas De Schampheleire <[email protected]>
ubiformat returns 255 even on successful format actions, since the upgrade of mtd-utils to version 2.1.1.
Backport an upstream patch that fixes this issue. No new release is made yet.
Signed-off-by Thomas De Schampheleire <[email protected]>--- ...-utils-Fix-return-value-of-ubiformat.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patchpackage/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch new file +60
-1@@ -0,0 +1,60 @@ +From 95633c4dfe943a701d4fcd809e6cabf4bf8710b8 Mon Sep 17 00:00:00 2001 +From: Barry Grussling <[email protected]> +Date: Sun, 12 Jan 2020 12:33:32 -0800 +Subject: [PATCH] mtd-utils: Fix return value of ubiformat + +This changeset fixes a feature regression in ubiformat. Older versions of +ubiformat, when invoked with a flash-image, would return 0 in the case no error +was encountered. Upon upgrading to latest, it was discovered that ubiformat +returned 255 even without encountering an error condition. + +This changeset corrects the above issue and causes ubiformat, when given an +image file, to return 0 when no errors are detected. + +Tested by running through my loading scripts and verifying ubiformat returned +0. + +Signed-off-by: Barry Grussling <[email protected]> +Signed-off-by: David Oberhollenzer <[email protected]> +[import into Buildroot] +Signed-off-by: Thomas De Schampheleire <[email protected]> +--- + ubi-utils/ubiformat.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c +index 64afad2..be40e52 100644 +--- a/ubi-utils/ubiformat.c ++++ b/ubi-utils/ubiformat.c +@@ -550,6 +550,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + struct ubi_vtbl_record *vtbl; + int eb1 = -1, eb2 = -1; + long long ec1 = -1, ec2 = -1; ++ int ret = -1; + + write_size = UBI_EC_HDR_SIZE + mtd->subpage_size - 1; + write_size /= mtd->subpage_size; +@@ -643,8 +644,10 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + if (!args.quiet && !args.verbose) + printf("\n"); + +- if (novtbl) ++ if (novtbl) { ++ ret = 0; + goto out_free; ++ } + + if (eb1 == -1 || eb2 == -1) { + errmsg("no eraseblocks for volume table"); +@@ -669,7 +672,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + + out_free: + free(hdr); +- return -1; ++ return ret; + } + + int main(int argc, char * const argv[]) +-- +2.24.1 + --
Quoted 2 lines
2.24.1
In my view this should be applied on both master and 2020.02.y.
Yann E. MORIN
AppliedPATCH 1/1 package/mtd: add upstream patch that fixes ubiformat return code
In reply to Thomas De SchampheleireThomas, All,
On 2020-04-07 11:58 +0200, Thomas De Schampheleire spake thusly:
Quoted 9 lines
From: Thomas De Schampheleire <[email protected]>
ubiformat returns 255 even on successful format actions, since the upgrade of mtd-utils to version 2.1.1.
Backport an upstream patch that fixes this issue. No new release is made yet.
Signed-off-by Thomas De Schampheleire <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 78 lines
--- ...-utils-Fix-return-value-of-ubiformat.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patchpackage/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch new file +60
-0@@ -0,0 +1,60 @@ +From 95633c4dfe943a701d4fcd809e6cabf4bf8710b8 Mon Sep 17 00:00:00 2001 +From: Barry Grussling <[email protected]> +Date: Sun, 12 Jan 2020 12:33:32 -0800 +Subject: [PATCH] mtd-utils: Fix return value of ubiformat + +This changeset fixes a feature regression in ubiformat. Older versions of +ubiformat, when invoked with a flash-image, would return 0 in the case no error +was encountered. Upon upgrading to latest, it was discovered that ubiformat +returned 255 even without encountering an error condition. + +This changeset corrects the above issue and causes ubiformat, when given an +image file, to return 0 when no errors are detected. + +Tested by running through my loading scripts and verifying ubiformat returned +0. + +Signed-off-by: Barry Grussling <[email protected]> +Signed-off-by: David Oberhollenzer <[email protected]> +[import into Buildroot] +Signed-off-by: Thomas De Schampheleire <[email protected]> +--- + ubi-utils/ubiformat.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c +index 64afad2..be40e52 100644 +--- a/ubi-utils/ubiformat.c ++++ b/ubi-utils/ubiformat.c +@@ -550,6 +550,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + struct ubi_vtbl_record *vtbl; + int eb1 = -1, eb2 = -1; + long long ec1 = -1, ec2 = -1; ++ int ret = -1; + + write_size = UBI_EC_HDR_SIZE + mtd->subpage_size - 1; + write_size /= mtd->subpage_size; +@@ -643,8 +644,10 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + if (!args.quiet && !args.verbose) + printf("\n"); + +- if (novtbl) ++ if (novtbl) { ++ ret = 0; + goto out_free; ++ } + + if (eb1 == -1 || eb2 == -1) { + errmsg("no eraseblocks for volume table"); +@@ -669,7 +672,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, + + out_free: + free(hdr); +- return -1; ++ return ret; + } + + int main(int argc, char * const argv[]) +-- +2.24.1 +Signature · 6 lines
2.24.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'