* [PATCH 1/2] tools/thermal: tmon: simplify Makefile
2021-07-30 11:47 [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Rolf Eike Beer
@ 2021-07-30 11:49 ` Rolf Eike Beer
2021-07-30 11:51 ` [PATCH 2/2] tools/thermal: tmon: default to prefixed pkg-config when crosscompiling Rolf Eike Beer
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Rolf Eike Beer @ 2021-07-30 11:49 UTC (permalink / raw)
To: linux-acpi
Cc: Zhang Rui, Markus Mayer, linux-kbuild, linux-kernel, Jiri Olsa,
Arnaldo Carvalho de Melo, Jiri Kosina
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
tools/thermal/tmon/Makefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index 9db867df76794..3e650878ea824 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -13,7 +13,6 @@ CC?= $(CROSS_COMPILE)gcc
PKG_CONFIG?= pkg-config
override CFLAGS+=-D VERSION=\"$(VERSION)\"
-LDFLAGS+=
TARGET=tmon
INSTALL_PROGRAM=install -m 755 -p
@@ -33,7 +32,6 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(STATIC) panelw ncursesw 2> /
$(PKG_CONFIG) --cflags $(STATIC) panel ncurses 2> /dev/null)
OBJS = tmon.o tui.o sysfs.o pid.o
-OBJS +=
tmon: $(OBJS) Makefile tmon.h
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $(TARGET) $(TMON_LIBS)
@@ -42,15 +40,13 @@ valgrind: tmon
sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET) 1> /dev/null
install:
- - mkdir -p $(INSTALL_ROOT)/$(BINDIR)
- - $(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/$(BINDIR)/$(TARGET)"
+ - $(INSTALL_PROGRAM) -D "$(TARGET)" "$(INSTALL_ROOT)/$(BINDIR)/$(TARGET)"
uninstall:
$(DEL_FILE) "$(INSTALL_ROOT)/$(BINDIR)/$(TARGET)"
clean:
- find . -name "*.o" | xargs $(DEL_FILE)
- rm -f $(TARGET)
+ rm -f $(TARGET) $(OBJS)
dist:
git tag v$(VERSION)
--
2.32.0
--
Rolf Eike Beer, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055
emlix - smart embedded open source
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] tools/thermal: tmon: default to prefixed pkg-config when crosscompiling
2021-07-30 11:47 [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Rolf Eike Beer
2021-07-30 11:49 ` [PATCH 1/2] tools/thermal: tmon: simplify Makefile Rolf Eike Beer
@ 2021-07-30 11:51 ` Rolf Eike Beer
2021-08-14 11:18 ` [PATCH] MAINTAINERS: Add missing userspace thermal tools to the thermal section Daniel Lezcano
2021-08-19 9:40 ` [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Jiri Kosina
3 siblings, 0 replies; 6+ messages in thread
From: Rolf Eike Beer @ 2021-07-30 11:51 UTC (permalink / raw)
To: linux-acpi
Cc: Zhang Rui, Markus Mayer, linux-kbuild, linux-kernel, Jiri Olsa,
Arnaldo Carvalho de Melo, Jiri Kosina
This matches what other parts of the tools/ directory already do.
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Cc: stable@vger.kernel.org
---
tools/thermal/tmon/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index 3e650878ea824..f9c52b7fab7bc 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -10,7 +10,7 @@ override CFLAGS+= $(call cc-option,-O3,-O1) ${WARNFLAGS}
# Add "-fstack-protector" only if toolchain supports it.
override CFLAGS+= $(call cc-option,-fstack-protector-strong)
CC?= $(CROSS_COMPILE)gcc
-PKG_CONFIG?= pkg-config
+PKG_CONFIG?= $(CROSS_COMPILE)pkg-config
override CFLAGS+=-D VERSION=\"$(VERSION)\"
TARGET=tmon
--
2.32.0
--
Rolf Eike Beer, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055
emlix - smart embedded open source
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] MAINTAINERS: Add missing userspace thermal tools to the thermal section
2021-07-30 11:47 [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Rolf Eike Beer
2021-07-30 11:49 ` [PATCH 1/2] tools/thermal: tmon: simplify Makefile Rolf Eike Beer
2021-07-30 11:51 ` [PATCH 2/2] tools/thermal: tmon: default to prefixed pkg-config when crosscompiling Rolf Eike Beer
@ 2021-08-14 11:18 ` Daniel Lezcano
2021-08-19 9:40 ` [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Jiri Kosina
3 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2021-08-14 11:18 UTC (permalink / raw)
To: rui.zhang, daniel.lezcano; +Cc: linux-kernel, eb, mmayer, jolsa, acme, jkosina
Patches related to the tmon which is in tools/thermal are floating around
since years because it is unclear who takes care of it.
Add the missing userspace tools directory related to thermal to fix the
situation.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index a61f4f3b78a9..a78f490fd128 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18358,6 +18358,7 @@ F: drivers/thermal/
F: include/linux/cpu_cooling.h
F: include/linux/thermal.h
F: include/uapi/linux/thermal.h
+F: tools/thermal/
THERMAL DRIVER FOR AMLOGIC SOCS
M: Guillaume La Roque <glaroque@baylibre.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build
2021-07-30 11:47 [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Rolf Eike Beer
` (2 preceding siblings ...)
2021-08-14 11:18 ` [PATCH] MAINTAINERS: Add missing userspace thermal tools to the thermal section Daniel Lezcano
@ 2021-08-19 9:40 ` Jiri Kosina
2021-08-19 10:02 ` Daniel Lezcano
3 siblings, 1 reply; 6+ messages in thread
From: Jiri Kosina @ 2021-08-19 9:40 UTC (permalink / raw)
To: Rolf Eike Beer
Cc: linux-acpi, Zhang Rui, Markus Mayer, linux-kbuild, linux-kernel,
Jiri Olsa, Arnaldo Carvalho de Melo, Daniel Lezcano
On Fri, 30 Jul 2021, Rolf Eike Beer wrote:
> Hi,
>
> cross-building tmon can fail because it uses the non-prefixed, i.e. host, pkg-
> config.
>
> If you prefer a merge the code is also available at:
>
> https://github.com/emlix/linux thermal-makefile
>
> Would be nice if someone could finally pick this up, it's almost 3 years now…
>
> If someone knows anyone who better fits into these reviews please add CC's,
> sadly tools/thermal/ is not covered in MAINTAINERS.
That would be Daniel Lezcano. CCing.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build
2021-08-19 9:40 ` [PATCH][RESEND] tools/thermal/tmon: simplify Makefile and fix cross build Jiri Kosina
@ 2021-08-19 10:02 ` Daniel Lezcano
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2021-08-19 10:02 UTC (permalink / raw)
To: Jiri Kosina, Rolf Eike Beer
Cc: linux-acpi, Zhang Rui, Markus Mayer, linux-kbuild, linux-kernel,
Jiri Olsa, Arnaldo Carvalho de Melo
Hi Jiri,
On 19/08/2021 11:40, Jiri Kosina wrote:
> On Fri, 30 Jul 2021, Rolf Eike Beer wrote:
>
>> Hi,
>>
>> cross-building tmon can fail because it uses the non-prefixed, i.e. host, pkg-
>> config.
>>
>> If you prefer a merge the code is also available at:
>>
>> https://github.com/emlix/linux thermal-makefile
>>
>> Would be nice if someone could finally pick this up, it's almost 3 years now…
>>
>> If someone knows anyone who better fits into these reviews please add CC's,
>> sadly tools/thermal/ is not covered in MAINTAINERS.
>
> That would be Daniel Lezcano. CCing.
I sent a patch for that
https://lkml.org/lkml/2021/8/14/152
and applied the series
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 6+ messages in thread