lkml.org 
[lkml]   [2008]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] [KBUILD] fix external module install path
    On Mon, May 07, 2007 at 04:38:03PM -0500, Eric Sandeen wrote:
    > Installing external modules is supposed to put them in some path
    > under /lib/modules/<version>/extra/subdir/, but this change:
    > http://linux.bkbits.net:8080/linux-2.6/?PAGE=cset&REV=1.1982.9.23
    > makes them go under /lib/modules/<version>/extrasubdir
    >
    > (for example, make M=fs/ext3 modules_install puts ext3.ko in
    > /lib/modules/<version>/extrafs/ext3.ko)
    >
    > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
    >
    > Index: linux-2.6.21/scripts/Makefile.modinst
    > ===================================================================
    > --- linux-2.6.21.orig/scripts/Makefile.modinst
    > +++ linux-2.6.21/scripts/Makefile.modinst
    > @@ -21,7 +21,7 @@ quiet_cmd_modules_install = INSTALL $@
    >
    > # Modules built outside the kernel source tree go into extra by default
    > INSTALL_MOD_DIR ?= extra
    > -ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(KBUILD_EXTMOD),,$(@D))
    > +ext-mod-dir = $(INSTALL_MOD_DIR)/$(subst $(KBUILD_EXTMOD),,$(@D))
    >
    > modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))

    Hi Eric.

    Took a look at this now and fixed it like this.
    Let me know if you see other issues.

    [I know this is more than 6 months ago you reported it - sorry]

    Sam

    From 9af97c5f91e7dd4996b501a19b5a128b1600d511 Mon Sep 17 00:00:00 2001
    From: Sam Ravnborg <sam@ravnborg.org>
    Date: Tue, 1 Jan 2008 13:40:28 +0100
    Subject: [PATCH] kbuild: fix installing external modules

    Eric Sandeen <sandeen@redhat.com> reported:
    Installing external modules is supposed to put them in some path
    under /lib/modules/<version>/extra/subdir/, but this change:
    http://linux.bkbits.net:8080/linux-2.6/?PAGE=cset&REV=1.1982.9.23
    makes them go under /lib/modules/<version>/extrasubdir

    (for example, make M=fs/ext3 modules_install puts ext3.ko in
    /lib/modules/<version>/extrafs/ext3.ko)

    This was the case only when specifying a trailing slash to M=..

    Fixed by removing trailing slash if present so
    we correctly match dir part of target.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Eric Sandeen <sandeen@redhat.com>
    ---
    scripts/Makefile.modinst | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
    index f0ff248..efa5d94 100644
    --- a/scripts/Makefile.modinst
    +++ b/scripts/Makefile.modinst
    @@ -21,7 +21,7 @@ quiet_cmd_modules_install = INSTALL $@

    # Modules built outside the kernel source tree go into extra by default
    INSTALL_MOD_DIR ?= extra
    -ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(KBUILD_EXTMOD),,$(@D))
    +ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D))

    modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))

    --
    1.5.3.7.1112.g9758e


    \
     
     \ /
      Last update: 2008-01-01 13:49    [W:3.545 / U:3.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site