mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
Andrea Adami
edbe41f53e
Building the recipe with TUNE_FEATURES = "aarch64" and TARGET_FPU = "" fails. See patch headers for more details. Patch sent upstream for master, here rebased for 1.5.2. Tested runtime on armv5. While there backport one more patch fixing warnings in libmtd.c and move the patches in their specific dir, preparing for v2.0.1. Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From 5d4a66b502003ef385dab31a17012246407e7364 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Adami <andrea.adami@gmail.com>
|
|
Date: Sun, 29 Jun 2014 00:44:03 +0200
|
|
Subject: [PATCH 5/9] common.h: more workarounds for klibc compatibility
|
|
|
|
Patch is addressing two issues:
|
|
* First, Klibc doesn't have rpmatch().
|
|
* Second, Klibc lacks getline()
|
|
|
|
Fixes:
|
|
| LD ubi-utils/ubiformat
|
|
| .../git/ubi-utils/ubiformat.o: In function `prompt':
|
|
| .../git/./include/common.h:157: undefined reference to `getline'
|
|
| .../git/./include/common.h:164: undefined reference to `rpmatch'
|
|
| .../git/./include/common.h:157: undefined reference to `getline'
|
|
| .../git/./include/common.h:164: undefined reference to `rpmatch'
|
|
|
|
Upstream-Status: Submitted
|
|
|
|
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
|
|
---
|
|
include/common.h | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/common.h b/include/common.h
|
|
index 5a20964..2f51e1c 100644
|
|
--- a/include/common.h
|
|
+++ b/include/common.h
|
|
@@ -161,15 +161,17 @@ static inline int __rpmatch(const char *resp)
|
|
*/
|
|
static inline bool prompt(const char *msg, bool def)
|
|
{
|
|
- char *line = NULL;
|
|
- size_t len;
|
|
+ char *line;
|
|
bool ret = def;
|
|
|
|
+ const int sizeof_line = 2;
|
|
+ line = malloc(sizeof_line);
|
|
+
|
|
do {
|
|
normsg_cont("%s (%c/%c) ", msg, def ? 'Y' : 'y', def ? 'n' : 'N');
|
|
fflush(stdout);
|
|
|
|
- while (getline(&line, &len, stdin) == -1) {
|
|
+ while (fgets(line, sizeof_line, stdin) == NULL) {
|
|
printf("failed to read prompt; assuming '%s'\n",
|
|
def ? "yes" : "no");
|
|
break;
|
|
--
|
|
2.7.4
|
|
|