mirror of
https://git.yoctoproject.org/poky
synced 2026-03-03 13:59:40 +01:00
1905f253d2
* Strace just aborts with two-digit kernel versions (e.g. 3.0-foo). Backport a patch from strace Git. (From OE-Core rev: bff8456be448f0ae7ddae917ed3e9893f056376d) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
39 lines
910 B
Diff
39 lines
910 B
Diff
Upstream-Status: Backport
|
|
|
|
From 0dbc80de895c25769791b7726022a274695eec31 Mon Sep 17 00:00:00 2001
|
|
From: "Dmitry V. Levin" <ldv@altlinux.org>
|
|
Date: Mon, 14 May 2012 23:42:10 +0000
|
|
Subject: [PATCH] Fix kernel release string parsing
|
|
|
|
* strace.c (get_os_release): Handle "X.Y-something" utsname.release
|
|
strings properly.
|
|
|
|
Reported-by: Bryce Gibson <bryce@gibson-consulting.com.au>
|
|
---
|
|
strace.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/strace.c b/strace.c
|
|
index 857136d..65dee7d 100644
|
|
--- a/strace.c
|
|
+++ b/strace.c
|
|
@@ -1432,8 +1432,14 @@ get_os_release(void)
|
|
break;
|
|
while (*p >= '0' && *p <= '9')
|
|
p++;
|
|
- if (*p != '.')
|
|
+ if (*p != '.') {
|
|
+ if (rel >= KERNEL_VERSION(0,1,0)) {
|
|
+ /* "X.Y-something" means "X.Y.0" */
|
|
+ rel <<= 8;
|
|
+ break;
|
|
+ }
|
|
error_msg_and_die("Bad OS release string: '%s'", u.release);
|
|
+ }
|
|
p++;
|
|
}
|
|
return rel;
|
|
--
|
|
1.7.10.4
|
|
|