Patch "tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message May 2, 2015

Subsystems (2)

Stable branch Turbostat utility

lore

Share & tools

lore

[email protected]

author maintainer Applied

2015-05-02 16:44 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

    tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-power-turbostat-use-curdir-instead-of-pwd-and-add-support-for-o-option-in-makefile.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f82263c6989c31ae9b94cecddffb29dcbec38710 Mon Sep 17 00:00:00 2001

From: Thomas D <[email protected]>
Date: Mon, 5 Jan 2015 21:37:23 +0100
Subject: tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile

From: Thomas D <[email protected]>

commit f82263c6989c31ae9b94cecddffb29dcbec38710 upstream.

Since commit ee0778a30153
("tools/power: turbostat: make Makefile a bit more capable") turbostat's Makefile is using

  [...]
  BUILD_OUTPUT    := $(PWD)
  [...]

which obviously causes trouble when building "turbostat" with

make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat

because GNU make does not update nor guarantee that $PWD is set.

This patch changes the Makefile to use $CURDIR instead, which GNU make guarantees to set and update (i.e. when using "make -C ...") and also adds support for the O= option (see "make help" in your root of your kernel source tree for more details).

Link https://bugs.gentoo.org/show_bug.cgi?id=533918

Fixes ee0778a30153 ("tools/power: turbostat: make Makefile a bit more capable")

Signed-off-by Thomas D. <[email protected]>

Cc Mark Asselstine <[email protected]>

Signed-off-by Len Brown <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 tools/power/x86/turbostat/Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

tools/power/x86/turbostat/Makefile +5 -1

@@ -1,8 +1,12 @@
 CC		= $(CROSS_COMPILE)gcc
-BUILD_OUTPUT	:= $(PWD)
+BUILD_OUTPUT	:= $(CURDIR)
 PREFIX		:= /usr
 DESTDIR		:=
 
+ifeq ("$(origin O)", "command line")
+	BUILD_OUTPUT := $(O)
+endif
+
 turbostat : turbostat.c
 CFLAGS +=	-Wall
 CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/tools-power-turbostat-use-curdir-instead-of-pwd-and-add-support-for-o-option-in-makefile.patch