Commit Graph
86 Commits
Author SHA1 Message Date
Jean Delvare e0fc13aa32 Move note about sensors.conf from install to install_user.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2273 7894878c-1315-0410-8ee3-d5d059ff63e0
2004-02-06 18:23:17 +00:00
Jean Delvare 17abdf40fa No, do not ignore errors.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2272 7894878c-1315-0410-8ee3-d5d059ff63e0
2004-02-06 17:35:43 +00:00
Mark D. Studebaker 74de227224 move the CC definition up so it is used in the MODPREF definition
rather than the default (cc)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2260 7894878c-1315-0410-8ee3-d5d059ff63e0
2004-02-01 22:44:07 +00:00
Jean Delvare df5deeff65 Alpha MODCFLAGS change suggested by Daniel Nilsson.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2193 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-29 19:29:16 +00:00
Mark D. Studebaker 64aeb747a4 remove -o and -g args to install
Date: Thu, 18 Dec 2003 22:42:36 +0100
From: Haakon Riiser <haakon.riiser@fys.uio.no>
To: sensors@Stimpy.netroedge.com
Subject: lm_sensors 2.8.2 / DESTDIR / root

The reason for this email is that I always try to avoid running
Makefiles as root, even during 'make install'.  Therefore, I
always use the DESTDIR feature, when it's available.  Until today,
I always built i2c and lm_sensors by doing

  $ make
  $ make -i install DESTDIR=/foo
  $ cd /foo && su root && fix permissions/ownership && install

The -i flag to make install is a kludge to avoid having to be root
while installing to the DESTDIR, and it's only required because
the files are installed with "-o root -g root".  Using the -i
flag is of course not a good idea, since more fatal errors can
easily fly by undetected.

Today, I upgraded to Linux 2.6.0, and tried a similar install
procedure for lm_sensors, except that the make target is now "user"
and the install target is "user_install".  I now noticed that the
DESTDIR variable is not used everywhere in "user_install", so I
couldn't use the -i kludge anymore.  Instead, I wrote a patch that
removes the "-o root -g root" arguments to install everywhere, and
I also tried to add DESTDIR to all files/directories installed.
(The patch only applies to lm_sensors, not i2c, since only
lm_sensors is required in Linux 2.6.0.)

There's really no reason to say -o root -g root anyway, since if you
do install directly with make install, you have to be logged in as
root, and then the files will get the right ownership by default.
Much of the point of installing to a temporary DESTDIR is that you
don't have to be root, and that you can prepare the installation
by hand.  Fixing the ownership is trivial:

  chown -R root.root $DESTDIR


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2189 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-23 23:13:38 +00:00
Jean Delvare 3911c658fa rpath patch by Joerg Dorchain <joerg@dorchain.net>.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2179 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-12-15 20:27:31 +00:00
Jean Delvare 287b53403d Don't include dmidecode anymore.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2118 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-29 19:59:31 +00:00
Jean Delvare bd0840096c Compile with "-g -O" instead of "-O2" when DEBUG is set to 1.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2103 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-29 13:13:54 +00:00
Mark D. Studebaker 320562a22b don't build module dependencies for user and user_install
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2085 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-22 02:32:30 +00:00
Mark M. Hoffman e93f810917 make it quit earlier if missing $(LINUX)/.config; also add note for
users of stock RedHat kernels


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2051 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-11 07:11:02 +00:00
Mark D. Studebaker 9e6d84d135 add dependency on the kernel .config file; quit without it
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2049 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-11-09 03:00:31 +00:00
Mark D. Studebaker 9728b298e3 add more programs installed in /usr/local/sbin
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2026 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-10-27 01:26:44 +00:00
Mark D. Studebaker fe368024cf remove COMPILE_KERNEL; was previously replaced by 'make user'
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1974 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-08-24 14:51:17 +00:00
Jean Delvare 283e61378a Take LINUX_HEADERS out of ALL_CPPFLAGS, use it in MODCPPFLAGS
only. This fixes compilation on PPC and possibly others.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1942 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-08-06 14:22:50 +00:00
Jean Delvare c4fae9925d Add two important notes about the configuration file and dmidecode
after "make install".


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1874 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-07-08 09:06:50 +00:00
Mark M. Hoffman 43f48c1789 use tab instead of spaces before depmod command
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1835 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-07-03 02:04:19 +00:00
Jean Delvare 98a5fe64bd Automatically run depmod -a after installing modules.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1828 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-07-02 07:56:40 +00:00
Jean Delvare 9755181f18 Armored gcc -print-search-dirs against locales.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1827 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-07-02 07:27:39 +00:00
Mark D. Studebaker 0948e17ee9 add new build targets 'user' and 'user_install'.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1822 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-28 20:04:51 +00:00
Jean Delvare 2e120f8a2a Make -Wall mandatory. Add -W to optional warnings.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1789 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-16 17:05:35 +00:00
Mark D. Studebaker b24442eed8 remove old gzipped modules;
remove old misc directory if empty


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1787 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-14 19:25:19 +00:00
Mark D. Studebaker e9c0fce42a adm1026 and auto-sensors.h patch from P.P.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1777 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-06-08 21:33:39 +00:00
Mark D. Studebaker ce5aceb748 replace -idirafter with -nostdinc and other magic from the kernel
makefile. This prevents ever picking up headers from /usr/include
     for module builds. Headers must be located in
     /lib/modules/`uname -r`/build


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1746 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-05-31 14:42:48 +00:00
Mark D. Studebaker 7eb36a199a handle multiple UTS_RELEASE definitions in linux/version.h;
as suggested by Mark Hoffman.
      Also revert -dirafter which doesn't work for gcc 2.95.2.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1739 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-05-30 03:13:07 +00:00
Mark D. Studebaker 06655ebe50 (mds)
Christian Hammers <ch@laathspell.de> wrote:

> Hello
>
> I always got the following error when compiling lm_sensors-2.7.0:
>
>
>>     gcc   -DMODVERSIONS -include /lib/modules/2.4.20-bigvideo-1/build/include/linux/modversions.h -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer -I.  -Ikernel/include -I/usr/local/include -I/lib/modules/2.4.20-bigvideo-1/build/include   -O2   -c kernel/busses/i2c-amd8111.c -o kernel/busses/i2c-amd8111.o
>
>
>
>>>     kernel/busses/i2c-amd8111.c:26:2: #error Your i2c is too old - i2c-2.7.0 or greater required!
>
>
>
> This is a compile problem as the include files of 2.7.0 are in
> /usr/local/include/linux/. gcc-3.2.3 just puts /usr/local/include at the
> end of the list although it is first on the command line and the info
> page says the list is scanned left to right.
>
>>         GNU CPP version 3.2.3 20030316 (Debian prerelease) (cpplib)
>>     (i386 Linux/ELF)
>>     GNU C version 3.2.3 20030316 (Debian prerelease) (i386-linux)
>>         compiled by GNU C version 3.2.3 20030316 (Debian prerelease).
>>     ignoring nonexistent directory "/usr/i386-linux/include"
>>     ignoring duplicate directory "/usr/local/include"
>>       as it is a non-system directory that duplicates a system directory
>>     #include "..." search starts here:
>>     #include <...> search starts here:
>>      .
>>      kernel/include
>>      /usr/local/include
>>      /usr/lib/gcc-lib/i386-linux/3.2.3/include
>>      /usr/include
>>      /lib/modules/2.4.20-bigvideo-1/build/include
>
>
>
> As a fix I suggest:
>
> # diff -u Makefile.orig Makefile
> --- Makefile.orig       2003-03-19 18:20:38.000000000 +0100
> +++ Makefile    2003-03-19 18:21:08.000000000 +0100
> @@ -178,7 +178,7 @@
>  # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables).
>  # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
>  # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
> -ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
> +ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -idirafter $(LINUX_HEADERS)
>  ALL_CFLAGS := -O2
>  ifeq ($(DEBUG),1)
>
>
>
> bye,
>
>   -christian-


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1735 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-04-19 23:45:02 +00:00
Mark D. Studebaker b13c20ad6d I2C_HEADERS = to := (from Philip Pokorny)
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1729 7894878c-1315-0410-8ee3-d5d059ff63e0
2003-03-17 02:56:48 +00:00
Jean Delvare e5a58dc1c3 Back to the old MODPREF
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1664 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-12-04 15:44:32 +00:00
Mark D. Studebaker 4b9ee225a1 add x86_64 compile flags; patch from Vojtech
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1663 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-12-04 03:39:32 +00:00
Jean Delvare be8a79a8bf Handle the case where /lib/modules/$KERNELVERSION/build doesn't
exist.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1654 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-11-28 19:00:25 +00:00
Jean Delvare 766ac8021e Take kernel source location from /lib/modules/x.x.x/build
Installation documentation updates


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1601 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-11-14 13:23:07 +00:00
Mark D. Studebaker 018f61392e take LINUX from /lib/modules/x.x.x/build; patch from
Dave Johnson <ddj@cascv.brown.edu>


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1548 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-09-21 22:18:31 +00:00
Mark D. Studebaker 87b8b165ba use $CFLAGS and $CPPFLAGS from environment or if specified
in Makfile. Patch from
             "Kevin P. Fleming" <kevin@labsysgrp.com>


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1361 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-04-29 01:37:07 +00:00
Merlin Hughes 1fb2fb31cb mh: sensord is only built if PROG_EXTRA:=sensord is specified.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1359 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-04-28 14:26:07 +00:00
Mark D. Studebaker 39cc76464b for kernels 2.4+, install modules to kernel/drivers/[i2c,sensors]
instead of misc, and delete old modules in misc. This will prevent
      duplicate modules.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1351 7894878c-1315-0410-8ee3-d5d059ff63e0
2002-04-20 02:50:37 +00:00
Mark D. Studebaker 7261264a35 Updates for DEC Tsunami from Oleg Vdovikin
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1108 7894878c-1315-0410-8ee3-d5d059ff63e0
2001-06-02 03:41:17 +00:00
Frodo Looijaard 258071770c A small comment about old flex versions
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@866 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-09-05 12:40:57 +00:00
Frodo Looijaard d8cff3d019 MODDIR changes, as promised
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@840 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-07-09 20:37:13 +00:00
Frodo Looijaard 3d1bd78e60 Changed detection of kernel name to use <linux/version.h>
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@786 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-03-22 22:59:17 +00:00
Frodo Looijaard d11e84a773 Cleared up where the I2C_HEADERS variable has to point to.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@734 7894878c-1315-0410-8ee3-d5d059ff63e0
2000-02-13 00:21:54 +00:00
Frodo Looijaard 01bad38253 Added DESTDIR Makefile variable
Set DESTDIR if you want to install at some other place then where you
will run everything from.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@675 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-12-24 19:52:28 +00:00
Merlin Hughes 8e5830460f (Merlin) Added simple sensord sensory logging daemon. Not installed by
default. Now uses libsensors. Ripped the display formatting code from
sensors (with some modification) but needless to say I've only tested
a single chip. Doesn't support alarms yet. With a bit of work, could
share the display formatting code with sensors so just one source needs
updating. Compiles on my machine.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@661 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-12-03 00:48:25 +00:00
Frodo Looijaard fc20445e02 Surer `make clean' implementation
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@581 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-27 10:52:50 +00:00
Frodo Looijaard c81440d21a Makefile changes for better behaviour with already patched kernels.
The Makefile now examine $(LINUX)/.config to see what modules need to be
compiled. It compiles only those modules which were either not configured
in at all, or were built as modules (ie. drivers which are built-in in the
kernel are not built, as they can not be overruled).

The above is still potentially dangerous, if we break the interface of
our modules. Still, it is much better than it was.
C


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@575 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-22 23:11:52 +00:00
Frodo Looijaard b7bb64350c Updated INSTALL and README files
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@567 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-20 15:12:11 +00:00
Frodo Looijaard 0a0860a7cd Makefile now automatically detects whether kernel modules need to
be made, or only the user-space utiltities.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@556 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-12 00:25:00 +00:00
Frodo Looijaard 576d91ee84 Matthias Andree's patch to find a better module directory to install
into. A a few other Makefile define changes. Nothing really
        important.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@547 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-03 11:47:33 +00:00
Frodo Looijaard d00f2e005d Moved the definition of SHELL to the top, to make it actually work.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@544 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-09-03 10:35:01 +00:00
Frodo Looijaard fcbe78a669 First step to make it possible to integrate lm_sensors modules into
the kernel.

* <kernel/init.h> is now included for all modules
* Initialization-time only functions and variables are marked with __init
* EXPORT_SYMBOL or EXPORT_NO_SYMBOLS declarations added


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@513 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-23 11:43:58 +00:00
Frodo Looijaard 24e547b88e First round of lm_sensors changes for the new I2C tree
* The i2c package can no longer be compiled as part of the lm_sensors tree
* The archive of the i2c package is removed
* smbus, i2c-dev and i2c-proc modules and headers have been removed; they
  are now completely integrated into the i2c package
* The fake i2c.h header has been removed; this also allowed us to remove
  the ugly LM_SENSORS and TBD defines.
* A new variable I2C_HEADERS is introduced in the Makefile. This allows
  us to install the i2c headers in, for example, /usr/local/include/linux.
* All files now include <linux/i2c.h> instead of "i2c.h" and "smbus.h"

Status: 'make dep' works, all the right include files are found. 'make all'
         does not yet work.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@496 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-19 11:45:27 +00:00
Frodo Looijaard 17bb1f4934 Slight fix to the Makefile for Debian users
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@495 7894878c-1315-0410-8ee3-d5d059ff63e0
1999-07-13 23:09:09 +00:00