Changeset 3723

Show
Ignore:
Timestamp:
11/14/02 14:23:07 (11 years ago)
Author:
khali
Message:

Take kernel source location from /lib/modules/x.x.x/build

Installation documentation updates

Location:
i2c/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • i2c/trunk/CHANGES

    r3722 r3723  
    1818----------------------------------------------------------------------------- 
    1919 
    20 2.6.6 (2002????) 
     202.6.6 (20021???) 
    2121  i2c-algo-ibm_ocp.[ch], i2c-adap-ibm_ocp.c: Rename i2c_iic_[add,del]_bus to 
    2222           i2c_ocp... to avoid duplicate with i2c-algo-ite in kernel 
     
    2626  i2c-proc.h: Add SENSORS_INSMOD_8; add naming for new dummy adapters 
    2727  mkpatch: Fix export-objs 
     28  Makefile: Take kernel source location from /lib/modules/x.x.x/build 
    2829 
    29302.6.5 (20020915) 
  • i2c/trunk/INSTALL

    r3528 r3723  
    8080out by itself their settings, but it is possible to overrule them. A list 
    8181is found below. Most important are the variables that determine where 
    82 your kernel is located (LINUX=/usr/src/linux) and where you want to 
    83 install your modules (MODDIR=/lib/modules/KERNELVERSION/misc) and 
    84 header files (LINUX_INCLUDE_DIR=/usr/local/include/linux). You can see 
    85 that the installation locations are choosen in such a way that they 
    86 are separate from the true kernel. 
     82your kernel is located (LINUX=/lib/modules/KERNELVERSION/build, usually 
     83links to /usr/src/linux or something similar) and where you want to 
     84install your modules (MODDIR=/lib/modules/KERNELVERSION) and header files 
     85(LINUX_INCLUDE_DIR=/usr/local/include/linux). You can see that the 
     86installation locations are choosen in such a way that they are separate 
     87from the true kernel. 
    8788 
    8889Compilation is done by `make all'; `make install' installs the package. 
     
    116117============================================================== 
    117118 
    118 BUILD_SYSTEM (both) default: lm_sensors 
     119BUILD_SYSTEM (both) (default: lm_sensors) 
    119120  The build system which is used. lm_sensors corresponds with compilation 
    120121  option 1; i2c with compilatin option 2. 
     
    123124  other shell. There have been conflicting reports on whether this is  
    124125  needed. 
    125 LINUX (both) default: /usr/src/linux 
     126KERNELVERSION (both) 
     127  The version of the currently running kernel. 
     128LINUX (both) (default: /lib/modules/$(KERNELVERSION)/build) 
    126129  The location of your kernel tree. 
    127 COMPILE_KERNEL (both) default: 1 
     130COMPILE_KERNEL (both) (default: 1) 
    128131  Determine whether you want to consider the kernel modules for compilation 
    129132  at all. By default, compilation option 1 will only compile and install 
     
    144147  invocation should determine this automatically, so you should not 
    145148  have to bother with this. 
    146 MODDIR (both) default: /lib/modules/KERNELVERSION/misc) 
     149MODDIR (both) (default: /lib/modules/$(KERNELVERSION)) 
    147150  The location where the kernel modules will be installed.  
    148 LINUX_INCLUDE_DIR (compilation option 1 only) default: /usr/local/include/linux 
    149   The location where the i2c header files will be installed 
    150 WARN (compilation option 1 only) default: 0 
     151LINUX_INCLUDE_DIR (compilation option 1 only) (default: /usr/local/include/linux) 
     152  The location where the i2c header files will be installed. 
     153WARN (compilation option 1 only) (default: 0) 
    151154  Generate additional compilation warnings; mainly interesting for 
    152155  developers. 
  • i2c/trunk/Makefile

    r3626 r3723  
    2424# kernel tree for this (and seems to give minor troubles in some cases). 
    2525# Make your choice. 
    26 BUILD_SYSTEM=lm_sensors 
    27 #BUILD_SYSTEM=i2c 
     26BUILD_SYSTEM := lm_sensors 
     27#BUILD_SYSTEM := i2c 
    2828 
    2929# If your /bin/sh is not bash, change the below definition so that make can 
    3030# find bash. Or you can hope your sh-like shell understands all scripts. 
    3131# I think so, but I have not tested it. 
    32 # SHELL=/usr/bin/bash 
     32#SHELL := /usr/bin/bash 
     33 
     34# The currently running kernel version. This is used right below to 
     35# determine where the kernel sources can be found. 
     36KERNELVERSION := $(shell uname -r) 
    3337 
    3438# The location of linux itself. This is used to find the kernel headers 
    3539# and other things. 
    36 LINUX=/usr/src/linux 
    37 LINUX_HEADERS=$(LINUX)/include 
     40#LINUX := /usr/src/linux 
     41LINUX := /lib/modules/$(KERNELVERSION)/build 
     42LINUX_HEADERS := $(LINUX)/include 
    3843 
    3944# Determine whether we need to compile the kernel modules, or only the 
     
    6065# The magic invocation will return something like this: 
    6166#   /lib/modules/2.2.15-ac9/misc 
    62 # MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
    63 MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 
     67#MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
     68#MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 
     69MODPREF := /lib/modules/$(KERNELVERSION) 
    6470 
    6571# This is the directory into which the header files will be installed.