Package: strace
Version: 4.15-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* kexec_file_load.patch: Skip kexec_file_load test on ppc* before 4.11.
During 4.11 development, the kexec_file_load syscall was wired up on
ppc. The result of this is that if you build strace with 4.11 headers,
but on a runtime kernel << 4.11, the testsuite will fail. This patch
addresses that issue.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers artful
APT policy: (500, 'artful')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.10.0-22-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru strace-4.15/debian/control strace-4.15/debian/control
--- strace-4.15/debian/control 2017-01-19 07:02:24.000000000 -0700
+++ strace-4.15/debian/control 2017-06-17 11:12:39.000000000 -0600
@@ -1,6 +1,5 @@
Source: strace
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Steve McIntyre <93...@debian.org>
+Maintainer: Steve McIntyre <93...@debian.org>
Section: utils
Priority: optional
Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2)
[alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc sparc64 x32],
debhelper (>= 7.0.0), gawk
diff -Nru strace-4.15/debian/patches/kexec_file_load.patch
strace-4.15/debian/patches/kexec_file_load.patch
--- strace-4.15/debian/patches/kexec_file_load.patch 1969-12-31
17:00:00.000000000 -0700
+++ strace-4.15/debian/patches/kexec_file_load.patch 2017-06-17
11:12:39.000000000 -0600
@@ -0,0 +1,19 @@
+Description: Skip kexec_file_load test on ppc* before 4.11.
+Author: Adam Conrad <adcon...@ubuntu.com>
+Last-Update: 2017-06-17
+
+--- strace-4.15.orig/tests/kexec_file_load.test
++++ strace-4.15/tests/kexec_file_load.test
+@@ -3,4 +3,12 @@
+ # Check decoding of kexec_file_load syscall.
+
+ . "${srcdir=.}/init.sh"
++
++case $(uname -m) in
++ ppc*)
++ # kexec_file_load was wired up in 80f60e509a03ff9ff2bdbf9cd1e935c6360b8bd9
++ require_min_kernel_version_or_skip 4.11
++ ;;
++esac
++
+ run_strace_match_diff -s9
diff -Nru strace-4.15/debian/patches/series strace-4.15/debian/patches/series
--- strace-4.15/debian/patches/series 2017-06-15 22:57:38.000000000 -0600
+++ strace-4.15/debian/patches/series 2017-06-17 11:12:39.000000000 -0600
@@ -1,3 +1,4 @@
disable-failing-tests.patch
ptrace-error-verbosity.patch
no-arm-unaligned-access
+kexec_file_load.patch
