From: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Date: Sun, 23 Nov 2014 20:13:44 +0000 (-0500)
Subject: ktest: Add back "tail -1" to kernelrelease make
X-Git-Tag: firefly_0821_release~176^2~2730^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17150fef4ab1f48d838008657cdaa168453a9fa6;p=firefly-linux-kernel-4.4.55.git

ktest: Add back "tail -1" to kernelrelease make

Commit 52d21580b362 "ktest: Use make -s kernelrelease" fixed commit
7ff525712acf "kbuild: fake the "Entering directory ..." message more simply"
as that commit added output after the make kernelrelease. But there's still
some build scripts that are used by ktest that has output before the make
is executed, and requires that only the last line is printed.

Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 35b118a38c2f..b9cd036f0442 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -2002,7 +2002,7 @@ sub get_version {
     # get the release name
     return if ($have_version);
     doprint "$make kernelrelease ... ";
-    $version = `$make -s kernelrelease`;
+    $version = `$make -s kernelrelease | tail -1`;
     chomp($version);
     doprint "$version\n";
     $have_version = 1;