From 4e5ba5f88285e94de4b78399306b07e0b57e7f03 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 21 Jun 2013 16:12:20 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../0032-Fix-kernel-release-string-parsing.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch (limited to 'meta/recipes-devtools/strace/strace-4.7/0032-Fix-kernel-release-string-parsing.patch') 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 @@ -Upstream-Status: Backport - -From 0dbc80de895c25769791b7726022a274695eec31 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf