summaryrefslogtreecommitdiffstats
path: root/rules/lm_sensors.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-10-22 09:54:02 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-10-22 11:48:42 +0200
commit4d6780feb79d5b6eb796d2a74a8c08f361ffa87a (patch)
treebcad6f3760b397bdee20ebaeb9a705527303bea0 /rules/lm_sensors.make
parent498724a441761cdf98c4117192d6c881cd406b01 (diff)
downloadptxdist-4d6780feb79d5b6eb796d2a74a8c08f361ffa87a.tar.gz
ptxdist-4d6780feb79d5b6eb796d2a74a8c08f361ffa87a.tar.xz
[lm_sensors] pass MACHINE to makefile in order to overwrite uname -m
This patch fixed the problem that the Makefile uses $(uname -m) to detect the "host" machine (in autoconf terms). Several x86 binaries are tried to build if the "build" machine (in autoconf terms) is x86 or amd64, which will fail if the "host" is e.g. powerpc and lacking the "sys/io.h" header. Also don't install "isaset" "isadump" on non x86 platforms. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/lm_sensors.make')
-rw-r--r--rules/lm_sensors.make8
1 files changed, 6 insertions, 2 deletions
diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make
index 0a160a9c2..bb03eb731 100644
--- a/rules/lm_sensors.make
+++ b/rules/lm_sensors.make
@@ -54,6 +54,7 @@ LM_SENSORS_ENV := $(CROSS_ENV)
LM_SENSORS_MAKEVARS := \
PREFIX=/usr \
LIBICONV="" \
+ MACHINE=$(PTXCONF_ARCH_STRING) \
$(CROSS_ENV_CC)
$(STATEDIR)/lm_sensors.prepare:
@@ -109,14 +110,17 @@ endif
ifdef PTXCONF_LM_SENSORS_SENSORS_DETECT
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/sensors-detect)
endif
+ifdef PTXCONF_LM_SENSORS_PWMCONFIG
+ @$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/pwmconfig)
+endif
+
+ifdef PTXCONF_ARCH_X86
ifdef PTXCONF_LM_SENSORS_ISASET
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/isaset)
endif
ifdef PTXCONF_LM_SENSORS_ISADUMP
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/isadump)
endif
-ifdef PTXCONF_LM_SENSORS_PWMCONFIG
- @$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/pwmconfig)
endif
@$(call install_finish, lm_sensors)