• Sam Ravnborg's avatar
    kbuild: fix installing external modules · 9b213118
    Sam Ravnborg authored
    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: default avatarSam Ravnborg <sam@ravnborg.org>
    Cc: Eric Sandeen <sandeen@redhat.com>
    9b213118
Makefile.modinst 1.02 KB
# ==========================================================================
# Installing modules
# ==========================================================================

PHONY := __modinst
__modinst:

include scripts/Kbuild.include

#

__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))

PHONY += $(modules)
__modinst: $(modules)
	@:

quiet_cmd_modules_install = INSTALL $@
      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@)

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

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

$(modules):
	$(call cmd,modules_install,$(MODLIB)/$(modinst_dir))


# Declare the contents of the .PHONY variable as phony.  We keep that
# information in a variable se we can use it in if_changed and friends.

.PHONY: $(PHONY)