summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-08-24 13:14:21 -0400
committerFrank Ch. Eigler <fche@elastic.org>2009-08-24 13:14:21 -0400
commite0ccd368149d63108042c97150012ad4a2e7593c (patch)
tree9539d89fe59069c20065fbbf3a7e483b6b24d3eb
parent0cd2665ec298fb30765f7f2fae019d525fc5b272 (diff)
downloadsystemtap-steved-e0ccd368149d63108042c97150012ad4a2e7593c.tar.gz
systemtap-steved-e0ccd368149d63108042c97150012ad4a2e7593c.tar.xz
systemtap-steved-e0ccd368149d63108042c97150012ad4a2e7593c.zip
PR4186 cont'd: tolerate older kbuild Makefile's chattiness
* buildrun.cxx (run_make_cmd): Add back >/dev/null for older kernels.
-rw-r--r--buildrun.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/buildrun.cxx b/buildrun.cxx
index 69cc5a66..71e6df56 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -63,6 +63,14 @@ run_make_cmd(systemtap_session& s, string& make_cmd)
else
make_cmd += " -s --no-print-directory";
+ if (strverscmp (s.kernel_base_release.c_str(), "2.6.29") < 0)
+ {
+ // Older kernels, before linux commit #fd54f502841c1, include
+ // gratuitous "echo"s in their Makefile. We need to suppress
+ // that with this bluntness.
+ make_cmd += " >/dev/null";
+ }
+
return stap_system (s.verbose, make_cmd);
}