Patchwork [1/1] systemtap: make session copy constructor pick up kernel builddir

login
register
mail settings
Submitter tom.zanussi@linux.intel.com
Date Feb. 2, 2013, 12:34 a.m.
Message ID <ca2f510bbb4652ed5e161c7c201f8f77f19c8355.1359764964.git.tom.zanussi@linux.intel.com>
Download mbox | patch
Permalink /patch/43859/
State New
Headers show

Comments

tom.zanussi@linux.intel.com - Feb. 2, 2013, 12:34 a.m.
From: Tom Zanussi <tom.zanussi@linux.intel.com>

When using the stap -r option with a full path to a kernel build tree
(i.e. one starting with /) along with --remote to execute the script
on a remote system, the build tree that I passed in was ignored and it
used some default locally-constructed location instead:

Checking "/lib/modules/3.4.24-yocto-standard/build/.config" failed
with error: No such file or directory

I traced it down to the s->clone() call in the path
ssh_remote->connect()->set_child_fds(), which unconditionally invokes
the following in the systemtap_session copy constructor:

   kernel_build_tree = "/lib/modules/" + kernel_release + "/build";

That doesn't seem correct - it seems to me it should be preserving the
value from the passed-in session object, which is what this does.

Fixes [YOCTO #3756]

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 .../systemtap/systemtap/copy-constructor-builddir.patch | 17 +++++++++++++++++
 meta/recipes-kernel/systemtap/systemtap_git.bb          |  2 +-
 meta/recipes-kernel/systemtap/systemtap_git.inc         |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/copy-constructor-builddir.patch

Patch

diff --git a/meta/recipes-kernel/systemtap/systemtap/copy-constructor-builddir.patch b/meta/recipes-kernel/systemtap/systemtap/copy-constructor-builddir.patch
new file mode 100644
index 0000000..27a569b
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/copy-constructor-builddir.patch
@@ -0,0 +1,17 @@ 
+Upstream-Status: Pending
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+
+Index: git/session.cxx
+===================================================================
+--- git.orig/session.cxx
++++ git/session.cxx
+@@ -254,7 +254,7 @@ systemtap_session::systemtap_session (co
+   last_token (0)
+ {
+   release = kernel_release = kern;
+-  kernel_build_tree = "/lib/modules/" + kernel_release + "/build";
++  kernel_build_tree = other.kernel_build_tree;
+   architecture = machine = normalize_machine(arch);
+   setup_kernel_release(kern.c_str());
+   native_build = false; // assumed; XXX: could be computed as in check_options()
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index a490a2e..7fc92c8 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -6,7 +6,7 @@  DEPENDS = "elfutils sqlite3 systemtap-native"
 DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
 DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi \
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 3e7bc7b..731b755 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -6,6 +6,7 @@  PV = "1.8+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
+           file://copy-constructor-builddir.patch \
           "
 
 FILESPATH = "${FILE_DIRNAME}/systemtap"