Changeset 5018

Timestamp:

11/12/07 14:43:50 (1 year ago)

Author:

khali

Message:

Makefile: Revert changeset 4738, fix bug #2187 differently. The original
fix was breaking the build for non-current kernels, or at least making it
more difficult than before.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/Makefile (modified) (4 diffs)
• lm-sensors/trunk/etc/config.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
-SVN-HEAD
-  Library: Fix fschrc and fschmd support
+  Makefile: Revert changeset 4738, fix bug #2187 differently
-  Program decode-dimms.pl: Fix DDR2 SDRAM module speed decoding
-                           Update manufacturer IDs.

lm-sensors/trunk/Makefile

@@ -84 +84 @@
-# The magic invocation will return something like this:
-#   /lib/modules/2.4.29
-
-
-
-
+
+
-
-# When building userspace for use with 2.4.x series kernels, we turn off
@@ -95 +93 @@
-# if you do this: you will need to install the libsysfs libraries on your
-# kernel 2.4.x systems also.
-/$(KERNELVERSION
+$(MODPREF
-        SYSFS_SUPPORT := 1
-else
@@ -103 +101 @@
-
-# Prevent 2.6+ users from using improper targets, as this won't work.
-/$(KERNELVERSION
+$(MODPREF
-    ifeq (, $(MAKECMDGOALS))
-        $(error For 2.6 kernels and later, use "make user")
@@ -323 +321 @@
-ifeq ($(DESTDIR),)
-        -if [ -r $(MODPREF)/build/System.map -a -x /sbin/depmod ] ; then \
-UTSRELEASE
+KERNELVERSION
-        fi
-else

lm-sensors/trunk/etc/config.c

@@ -6 +6 @@
- *
- * Note: since kernel 2.6.17, the definition of UTS_RELEASE has
- so this no longer works
+
- */
-#include <linux/version.h>
+#ifndef UTS_RELEASE
+#include <linux/utsrelease.h>
+#endif
-char *uts_release=UTS_RELEASE;