summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-02-18 19:21:19 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:46 +0000
commitd87f108f40db0cd1a780835ef1d4b666cd7e10f5 (patch)
tree30aef46a5a8bcfebed5545c1da3929e488bc3c3c /meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
parent20ba50bc8ce353e772f8af37958087e838973172 (diff)
downloadpoky-d87f108f40db0cd1a780835ef1d4b666cd7e10f5.tar.gz
mtd-utils: Bump revision to 1bfee866
This bumps the version to 2.0.1 release plus some more changes. The following patches were merged upstream: - 0001-Fix-build-with-musl.patch - 010-fix-rpmatch.patch - fix-armv7-neon-alignment.patch The `mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch` patch has been removed as the issue seems to have been addressed in the Linux MTD subsystem. The discussion can be seen at: http://lists.infradead.org/pipermail/linux-mtd/2011-August/037320.html Also a research to see if any other distribution had a similar patch included and they don't. So there is no clear need to keep diverging from upstream. See the logs below: ,----[ Changes from 2.0.0 -> 2.0.1 ] | 81049e5 Release mtd-utils-2.0.1 | 4458ad6 mtd-utils: tests: Avoid using less than two blocks in nandpagetest | 76a55b1 mtd-utils: ubinfo: add parameter check | 454a3d0 mkfs-ubifs: fix inclusion of uuid.h | df913e4 mtd-utils: tests: Add Erased Pages Bit Flip Test | f8bc7d9 Add const modifier to read only strings and string constants | a7c8cb3 Silence warnings about unused arguments | e511691 Remove unused variables and functions | ca517e8 Eliminate warnings about missing prototypes | 3029b65 Enable compiler warnings | 9eae306 Move libfec declarations to public header in global include directory | 022ce62 Use autoconf header detection correctly for libmissing | 1a3e3af Restructure autoconf configure.ac | e772dc8 Replace defunct ubifs_assert | b0b1bc5 mtd-utils: tests: Fix nandbiterrs Failure Check | 76e27a7 ubi-utils: Return error code if command line option is unknown | b8e785a nor-utils: Return error code if command line option is unknown | 12e27a1 jffsX-utils: Return error code if command line option is unknown | 9a357ee ftl_format: Use return directly to leave main function | 6890608 flashcp: Drop exit code defines | ccffc10 Use defines for exit code values | 871c2f1 mkfs.ubifs: Add support for symlinks in device table | c0972a5 libiniparser: remove unused function needing float | 5c57076 libubi.c: add klibc specific fixes for ioctl | dede98f Return correct error number in ubi_get_vol_info1 | a2eeedb Fix libmtd behaviour if MTD is not present on the system | 4dab9be Fix build with musl | 82839c3 Replace rpmatch() usage with checking first character of line | 7d026a8 Fix alignment trap triggered by NEON instructions | d7e8612 mtd-utils: Support jffs2 flash-erase for large OOB (>32b) | fc7aa01 ubi: tests: Speedup io_paral by using rand_r() | fdec8a4 ubi: tests: Support up to 65k NAND page size | d600419 ubi: tests: Replace variable-length array with malloc() | 1710e0c Remove README.udev from ubi-tests extra dist | e3e010c ubirename: trivial fixes to the help text | 1fed9b4 Remove UDEV_SETTLE_HACK | 22089b0 mtd-utils: serve_image: Use PRIdoff_t as format specifier. | 5a80691 mtd-utils: Fix format specifier definitions for off_t and loff_t. | 44558d1 nanddump: Add --skip-bad-blocks-to-start option | 2fc8058 nandwrite: Add --skip-bad-blocks-to-start option | 6df83fd nandwrite: fix/cleanup bad block skipping | 7b8981a nandwrite: replace erase loop with mtd_erase_multi | dffaa1d nandwrite: add stricter sanity checking for blockalign `---- ,----[ Changes from 2.0.1 -> 9c61735 ] | 9c61735 mtd: unittests: Stop testing stat() calls | daef4f1 mtd: unittests: Decode arg size from ioctl request | fd0b70b mtd: unittests: Use proper unsigned long type for ioctl requests | c75d104 ubi-utils: ubiformat.c: convert to integer arithmetic | 61afcc6 mtd-utils: common.c: convert to integer arithmetic | 6766178 Run unit test programs through "make check" | 098e91a mtd: tests: Fix check on ebcnt in nandpagetest | 9cfb02c libscan: fix a comment typo in libscan.h | 7086393 libmtd: fix a comment typo in dev_node2num | 3c54e4e ubi-utils: ubicrc32: process command line arguments first | ce50e6d nandbiterrs: Fix copy & paste fail | 03dafe3 Enable further warning flags, address new warnings | 0555cb2 jittertest: Use the appropriate versions of abs() | 475bf70 Mark or fix switch cases that fall through | cb2fcfc Add no-return attribute to usage() style functions | 81fd176 Remove self-assignments of unused paramters | 3b421ab mkfs.ubifs: ignore EOPNOTSUPP when listing extended attributes | 030a63b tests: checkfs: Remove unused source file from makefiles | 40dd609 misc-utils: initialize "ip" in docfdisk to NULL | 94f6573 ubi-tests: io_update: fix missleading indentation | afba4fc mkfs.ubifs: Apply squash-uids to the root node | 3a34784 Add ctags files to .gitignore `---- (From OE-Core rev: af5fd7146d178fdcbb7949280db1bbc4647003db) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch b/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
deleted file mode 100644
index 853de6af98..0000000000
--- a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 82839c3c0371ca2a1643a99d7d01f5bc1c850b28 Mon Sep 17 00:00:00 2001
2From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
3Date: Thu, 2 Mar 2017 11:40:36 +0100
4Subject: [PATCH] Replace rpmatch() usage with checking first character of line
5
6This is based on the patch from Khem Raj used by openembedded. In
7addition to the original patch, this also removes the fallback
8implementation that was provided for C libraries that don't implement
9rpmatch.
10
11Upstream-Status: Backport
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
15---
16 include/common.h | 25 ++++++-------------------
17 1 file changed, 6 insertions(+), 19 deletions(-)
18
19diff --git a/include/common.h b/include/common.h
20index d0c706d..d609257 100644
21--- a/include/common.h
22+++ b/include/common.h
23@@ -129,21 +129,6 @@ extern "C" {
24 fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \
25 } while(0)
26
27-/* uClibc versions before 0.9.34 and musl don't have rpmatch() */
28-#if defined(__UCLIBC__) && \
29- (__UCLIBC_MAJOR__ == 0 && \
30- (__UCLIBC_MINOR__ < 9 || \
31- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))) || \
32- !defined(__GLIBC__)
33-#undef rpmatch
34-#define rpmatch __rpmatch
35-static inline int __rpmatch(const char *resp)
36-{
37- return (resp[0] == 'y' || resp[0] == 'Y') ? 1 :
38- (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1;
39-}
40-#endif
41-
42 /**
43 * prompt the user for confirmation
44 */
45@@ -164,10 +149,12 @@ static inline bool prompt(const char *msg, bool def)
46 }
47
48 if (strcmp("\n", line) != 0) {
49- switch (rpmatch(line)) {
50- case 0: ret = false; break;
51- case 1: ret = true; break;
52- case -1:
53+ switch (line[0]) {
54+ case 'N':
55+ case 'n': ret = false; break;
56+ case 'Y':
57+ case 'y': ret = true; break;
58+ default:
59 puts("unknown response; please try again");
60 continue;
61 }
62--
632.6.1