qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 17:56:15 +02:00
Code

kernel.mk: Fix kernel module path for 3.0

Browse Source 
Linux 3.0 calls itself 3.0.0, so insmod expects the modules in
/lib/modules/3.0.0.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27761 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jogo 2011-07-24 21:42:33 +00:00
parent 3fb6c82409
commit c556e48ee5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/kernel.mk
View File

@ -33,7 +33,12 @@ else
KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) LINUX_UNAME_VERSION:=$(if $(word 3,$(subst ., ,$(KERNEL_BASE))),$(KERNEL_BASE),$(KERNEL_BASE).0)
ifneq ($(findstring -rc,$(LINUX_VERSION)),)
LINUX_UNAME_VERSION:=$(LINUX_UNAME_VERSION)-$(strip $(lastword $(subst -, ,$(LINUX_VERSION))))
endif
MODULES_SUBDIR:=lib/modules/$(LINUX_UNAME_VERSION)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
@ -139,8 +144,8 @@ $(call KernelPackage/$(1)/config)
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
ifneq ($(strip $(FILES)),) ifneq ($(strip $(FILES)),)
define Package/kmod-$(1)/install define Package/kmod-$(1)/install
mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) mkdir -p $$(1)/$(MODULES_SUBDIR)
$(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/ $(CP) -L $$(FILES) $$(1)/$(MODULES_SUBDIR)/
$(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
$(call KernelPackage/$(1)/install,$$(1)) $(call KernelPackage/$(1)/install,$$(1))
endef endef