Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp847429pja; Wed, 1 Apr 2020 09:46:23 -0700 (PDT) X-Google-Smtp-Source: APiQypJRNYh05lagcf/FQkLhuTcs6y/Gg/tq97HRPhk3pmq9/zQroXF+11QMDnHRDcm83JgZB+lZ X-Received: by 2002:aca:6184:: with SMTP id v126mr3334207oib.168.1585759583323; Wed, 01 Apr 2020 09:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759583; cv=none; d=google.com; s=arc-20160816; b=sbtmyuZ3vVitLCbYI50NTgmOBP7G70ySZBx7rEpSc27nT4iDUbcprJGoTuHr74M14E WH/uIyTMRemoPYhaKU2lguQkzHLQ25iCzBP6DuGMI1PmjkH2mqEI7WkNqpQFIWC6+Xqm t/JFSbhuH2D9R1y3UZ2wFJNsbFoBmPczfTBn/5njY7++gxIwH8Orxeqd/WBnCgm38rGu OWh6w0yZiEQS6nKEoGTgpW4HKljUI+R2E0NlmhGPr/iddpytUXmv80mlnTwRyRXhWtg5 d7hjDoqJFL80c4fSSlCs1sz0kWcFcwpnj9Sd4nIBSN3cRFoT4ouaS+u8Z4C6dAZGyW+Y UOvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YvAAYhAh5yDnkFC91zrLCUq7/s8UMgau9YVw/8vVGQk=; b=gSvczHmTBgqBUkSkd+iH9YBB5lU+Rm4eJsgCrKa8Hfgr6ghvK2kigRB6Lnxh443Uoe 5cLTGGsnv7grBr5/qNgMDAbvi2YTV5IppNmcUt6pCyFbyYF2tdDzpxs5Df/bGeSG2Bk+ 1nVGOjQ7l3iRiOha5rPp2GOGJTdPC5niK0Ombxc9jg6hJcx4DrFG0Him96Iav1B+N6BS C3rvNHEmDm/RPDbeKHcYZ5nw2ZlmJPi6qBo8eFixfxBabdYYP8yDwPyEvznr4GS20t4+ XUTjnNf0+qgXvF6MSuSP0jdQZO7CiUNY5a2v7NAZCFy5/J7RxpfWvJJMnM8WvVqtRBJQ Wyvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jCAIBmcy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11si978656otp.314.2020.04.01.09.46.09; Wed, 01 Apr 2020 09:46:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jCAIBmcy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389762AbgDAQon (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:45772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388037AbgDAQom (ORCPT ); Wed, 1 Apr 2020 12:44:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDC312063A; Wed, 1 Apr 2020 16:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759481; bh=njbwwtwH2gQSrWyiV6cvvDdtJ368sq8JCDsnpEetON0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jCAIBmcyRFd9bDfa9/3pKCmplLhgBJiZVbdQBsGjXhpG4/Vs8kJ19ccrHmFHlJKic wEgp0dedrzcxUswsCPM5jdUzXEfJ6xqS6cPkIQdYdOvBXANQgkoYJKY+/m40ZEVWQN 6D4QFNikkWWUO8r2ThjgFH9RpVoaBvzqe0X/STIY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Masami Hiramatsu , Andrew Morton , Borislav Petkov , Geert Uytterhoeven , Jiri Olsa , Masahiro Yamada , Michal Marek , Peter Zijlstra , Sasha Levin , "Steven Rostedt (VMware)" , Arnaldo Carvalho de Melo Subject: [PATCH 4.14 094/148] tools: Let O= makes handle a relative path with -C option Date: Wed, 1 Apr 2020 18:18:06 +0200 Message-Id: <20200401161601.969120213@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu commit be40920fbf1003c38ccdc02b571e01a75d890c82 upstream. When I tried to compile tools/perf from the top directory with the -C option, the O= option didn't work correctly if I passed a relative path: $ make O=BUILD -C tools/perf/ make: Entering directory '/home/mhiramat/ksrc/linux/tools/perf' BUILD: Doing 'make -j8' parallel build ../scripts/Makefile.include:4: *** O=/home/mhiramat/ksrc/linux/tools/perf/BUILD does not exist. Stop. make: *** [Makefile:70: all] Error 2 make: Leaving directory '/home/mhiramat/ksrc/linux/tools/perf' The O= directory existence check failed because the check script ran in the build target directory instead of the directory where I ran the make command. To fix that, once change directory to $(PWD) and check O= directory, since the PWD is set to where the make command runs. Fixes: c883122acc0d ("perf tools: Let O= makes handle relative paths") Reported-by: Randy Dunlap Signed-off-by: Masami Hiramatsu Cc: Andrew Morton Cc: Borislav Petkov Cc: Geert Uytterhoeven Cc: Jiri Olsa Cc: Masahiro Yamada Cc: Michal Marek Cc: Peter Zijlstra Cc: Sasha Levin Cc: Steven Rostedt (VMware) Cc: stable@vger.kernel.org Link: http://lore.kernel.org/lkml/158351957799.3363.15269768530697526765.stgit@devnote2 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/Makefile | 2 +- tools/scripts/Makefile.include | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -35,7 +35,7 @@ endif # Only pass canonical directory names as the output directory: # ifneq ($(O),) - FULL_O := $(shell readlink -f $(O) || echo $(O)) + FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O)) endif # --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 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) + dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),) + ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd) OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/) COMMAND_O := O=$(ABSOLUTE_O) ifeq ($(objtree),)