From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Borislav Petkov <bp@suse.de>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 04/15] perf tools: Correct Makefile.include
Date: Thu, 28 Feb 2013 18:05:16 -0300 [thread overview]
Message-ID: <1362085527-25326-5-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1362085527-25326-1-git-send-email-acme@infradead.org>
From: Borislav Petkov <bp@suse.de>
It looks at O= and adjusts the $(OUTPUT) variable based on what the
output directory will be. However, when O is defined but empty, it
wrongly becomes the user's $HOME dir which is not what we want. So check
it is not empty before working with it further.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1361374353-30385-4-git-send-email-bp@alien8.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/scripts/Makefile.include | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
index 00a05f4..f03e681 100644
--- a/tools/scripts/Makefile.include
+++ b/tools/scripts/Makefile.include
@@ -1,3 +1,4 @@
+ifneq ($(O),)
ifeq ($(origin O), command line)
dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
ABSOLUTE_O := $(shell cd $(O) ; pwd)
@@ -7,9 +8,10 @@ ifeq ($(objtree),)
objtree := $(O)
endif
endif
+endif
-ifneq ($(OUTPUT),)
# check that the output directory actually exists
+ifneq ($(OUTPUT),)
OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
endif
--
1.8.1.1.361.gec3ae6e
next prev parent reply other threads:[~2013-03-01 16:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-28 21:05 [GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 01/15] perf tools: check if -DFORTIFY_SOURCE=2 is allowed Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 02/15] perf tools: Remove a write-only variable in the debugfs code Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 03/15] perf tools: Honor parallel jobs Arnaldo Carvalho de Melo
2013-02-28 21:05 ` Arnaldo Carvalho de Melo [this message]
2013-02-28 21:05 ` [PATCH 05/15] perf tools: Sort command-list.txt alphabetically Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 06/15] perf tests: Make attr script verbose friendly Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 07/15] perf tests: Make attr script test event cpu Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 08/15] perf tests: Add attr record -C cpu test Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 09/15] perf tests: Add attr stat " Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 10/15] perf record: Fix -C option Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 11/15] perf tools: Introduce tools/lib/lk library Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 12/15] perf tools: Extract perf-specific stuff from debugfs.c Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 13/15] tools/vm: Switch to liblk library Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 14/15] perf annotate: Fix build with NO_NEWT=1 Arnaldo Carvalho de Melo
2013-02-28 21:05 ` [PATCH 15/15] perf report: " Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362085527-25326-5-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®