diff options
author | Kai Kang <kai.kang@windriver.com> | 2013-06-21 16:12:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-21 13:24:49 +0100 |
commit | 4e5ba5f88285e94de4b78399306b07e0b57e7f03 (patch) | |
tree | a51d247b69aef7be536f30fdf4619f9f121ccdca /meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch | |
parent | 011608a7b08c7fe5ad065da5179e1946ce250c57 (diff) | |
download | poky-4e5ba5f88285e94de4b78399306b07e0b57e7f03.tar.gz |
strace: update to 4.8
Update strace to 4.8:
* Update License file.
* Remove the backport patches which are already in version 4.8.
* Add file git-version-gen from git repo. Without this file configure
fails.
(From OE-Core rev: 3ae2592b40900caaebe2452c875912f82f9e5200)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch')
-rw-r--r-- | meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch b/meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch deleted file mode 100644 index cef42223d2..0000000000 --- a/meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From 0dbc80de895c25769791b7726022a274695eec31 Mon Sep 17 00:00:00 2001 | ||
4 | From: "Dmitry V. Levin" <ldv@altlinux.org> | ||
5 | Date: Mon, 14 May 2012 23:42:10 +0000 | ||
6 | Subject: [PATCH] Fix kernel release string parsing | ||
7 | |||
8 | * strace.c (get_os_release): Handle "X.Y-something" utsname.release | ||
9 | strings properly. | ||
10 | |||
11 | Reported-by: Bryce Gibson <bryce@gibson-consulting.com.au> | ||
12 | --- | ||
13 | strace.c | 8 +++++++- | ||
14 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/strace.c b/strace.c | ||
17 | index 857136d..65dee7d 100644 | ||
18 | --- a/strace.c | ||
19 | +++ b/strace.c | ||
20 | @@ -1432,8 +1432,14 @@ get_os_release(void) | ||
21 | break; | ||
22 | while (*p >= '0' && *p <= '9') | ||
23 | p++; | ||
24 | - if (*p != '.') | ||
25 | + if (*p != '.') { | ||
26 | + if (rel >= KERNEL_VERSION(0,1,0)) { | ||
27 | + /* "X.Y-something" means "X.Y.0" */ | ||
28 | + rel <<= 8; | ||
29 | + break; | ||
30 | + } | ||
31 | error_msg_and_die("Bad OS release string: '%s'", u.release); | ||
32 | + } | ||
33 | p++; | ||
34 | } | ||
35 | return rel; | ||
36 | -- | ||
37 | 1.7.10.4 | ||
38 | |||