Changeset 3626

Show
Ignore:
Timestamp:
04/20/02 04:41:39 (11 years ago)
Author:
mds
Message:

install modules in kernel/drivers/i2c instead of misc for newer kernels,

remove old modules in misc.

Location:
i2c/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • i2c/trunk/CHANGES

    r3620 r3626  
    1818----------------------------------------------------------------------------- 
    1919 
    20 2.6.3 (200203??) 
     202.6.4 (2002????) 
     21  Makefiles: For 2.4+ kernels, modules now install in 
     22             kernel/drivers/i2c , not misc/ , and 
     23             removes old versions in misc/ . 
     24 
     252.6.3 (20020322) 
    2126  TODO: Many updates 
    2227  Config.in: i2c-proc requires sysctl 
  • i2c/trunk/Makefile

    r3545 r3626  
    6060# The magic invocation will return something like this: 
    6161#   /lib/modules/2.2.15-ac9/misc 
    62 MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
     62# MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 
     63MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 
    6364 
    6465# This is the directory into which the header files will be installed. 
  • i2c/trunk/kernel/Module.mk

    r3619 r3626  
    8585all :: all-kernel 
    8686 
     87# 
     88# If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory 
     89# layout, so we install in kernel/drivers/i2c/ and remove old versions in misc/ 
     90# Otherwise we install in misc/ as before. 
     91# 
    8792install-kernel: all-kernel 
    8893        if [ -n "$(KERNELTARGETS)" ] ; then \ 
    89           $(MKDIR) $(DESTDIR)$(MODDIR) ; \ 
    90           $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ; \ 
     94          if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \ 
     95            $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ 
     96            $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \ 
     97            for i in $(KERNELTARGETS) ; do \ 
     98              $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \ 
     99            done \ 
     100          else \ 
     101            $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \ 
     102            $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/misc ; \ 
     103          fi \ 
    91104        fi 
    92105        if [ -n "$(KERNELINCLUDES)" ] ; then \