From patchwork Wed Oct 22 14:19:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 5132861 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E45899F349 for ; Wed, 22 Oct 2014 14:20:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE9C22015E for ; Wed, 22 Oct 2014 14:20:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C946020148 for ; Wed, 22 Oct 2014 14:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753207AbaJVOTt (ORCPT ); Wed, 22 Oct 2014 10:19:49 -0400 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:58518 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753206AbaJVOTs (ORCPT ); Wed, 22 Oct 2014 10:19:48 -0400 Received: from [67.246.153.56] ([67.246.153.56:50632] helo=gandalf.local.home) by cdptpa-oedge02 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id 59/91-01490-10DB7445; Wed, 22 Oct 2014 14:19:46 +0000 Date: Wed, 22 Oct 2014 10:19:44 -0400 From: Steven Rostedt To: LKML Cc: Masahiro Yamada , Peter Foley , Michal Marek , linux-kbuild@vger.kernel.org, Andrew Morton Subject: [PATCH] kbuild: Fix output of make kernelrelease Message-ID: <20141022101944.70d637cc@gandalf.local.home> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 7ff525712acf "kbuild: fake the "Entering directory ..." message more simply" changed the output of "make kernelrelease" such that the kernel release version was not the last line printed. This broke various tools that would find the kernel release with "make kernelrelease | tail -1". One of those tools that broke was ktest.pl which resides in the kernel. If the target of the make is "kernelrelease" do not print the "Leaving directory ..." message at the end as that will break tools that expect the kernelrelease version to be the last line outputted. Fixes: 7ff525712acf "kbuild: fake the "Entering directory ..." message more simply" Cc: Masahiro Yamada Cc: Peter Foley Cc: Michal Marek Signed-off-by: Steven Rostedt --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 05d67af376c5..83fc5f0398a0 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,14 @@ NAME = Shuffling Zombie Juror # (this increases performance and avoids hard-to-debug behaviour); MAKEFLAGS += -rR +# +# The target "kernelrelease" requires the last line to be the release +# of the kernel, not a "Leaving directory ..." message. +# ktest.pl and other tools require this. +ifeq ("$(MAKECMDGOALS)", "kernelrelease") +MAKEFLAGS += --no-print-directory +endif + # Avoid funny character set dependencies unexport LC_ALL LC_COLLATE=C