X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel.mk;h=c0d8ef8a2368f5a91226545943799429e6b85feb;hb=bd7766596466d7c65e8861fa686335ee9466e715;hp=db07900074d05adf2f1fc2137d8a1c4cff483692;hpb=80f27f1a42c6c9eabbd838a6f50b33d2c7968e7a;p=openwrt.git diff --git a/include/kernel.mk b/include/kernel.mk index db07900074..c0d8ef8a23 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -13,15 +13,14 @@ ifeq ($(DUMP),1) KERNEL?= BOARD?= LINUX_VERSION?= + LINUX_VERMAGIC?= else - export GCC_HONOUR_COPTS=s - - ifeq ($(KERNEL),2.6) - LINUX_KMOD_SUFFIX=ko - else - LINUX_KMOD_SUFFIX=o + ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) + export GCC_HONOUR_COPTS=s endif + LINUX_KMOD_SUFFIX=ko + ifneq (,$(findstring uml,$(BOARD))) KERNEL_CC?=$(HOSTCC) KERNEL_CROSS?= @@ -30,19 +29,35 @@ else KERNEL_CROSS?=$(TARGET_CROSS) endif - PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) - FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)") + ifeq ($(TARGET_BUILD),1) + PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) + FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)") + endif KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) - MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) + LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) + LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) + + 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) LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) - LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \ + ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) + ifeq ($(word 1,$(subst ., ,$(KERNEL_BASE))),3) + LINUX_SITE:=@KERNEL/linux/kernel/v3.x$(TESTING) + else + LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) + endif + endif ifneq ($(TARGET_BUILD),1) PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) @@ -64,15 +79,26 @@ define KernelPackage/Defaults endef define ModuleAutoLoad + $(SH_FUNC) \ export modules=; \ add_module() { \ - mkdir -p $(2)/etc/modules.d; \ - ( \ - for mod in $$$$$$$$2; do \ - getvar mod; \ - done \ - ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \ - modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \ + priority="$$$$$$$$1"; \ + mods="$$$$$$$$2"; \ + boot="$$$$$$$$3"; \ + shift 3; \ + for mod in $$$$$$$$mods; do \ + if [ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ]; then \ + mkdir -p $(2)/etc/modules.d; \ + echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ + fi; \ + done; \ + if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \ + if [ "$$$$$$$$boot" = "1" ]; then \ + mkdir -p $(2)/etc/modules-boot.d; \ + ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \ + fi; \ + modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ + fi; \ }; \ $(3) \ if [ -n "$$$$$$$$modules" ]; then \ @@ -101,18 +127,16 @@ define KernelPackage $(eval $(call Package/Default)) $(eval $(call KernelPackage/Defaults)) $(eval $(call KernelPackage/$(1))) - $(eval $(call KernelPackage/$(1)/$(KERNEL))) - $(eval $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))) + $(eval $(call KernelPackage/$(1)/$(BOARD))) define Package/kmod-$(1) TITLE:=$(TITLE) SECTION:=kernel CATEGORY:=Kernel modules DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)) + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)) VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) $(call KernelPackage/$(1)) - $(call KernelPackage/$(1)/$(KERNEL)) $(call KernelPackage/$(1)/$(BOARD)) endef @@ -130,11 +154,24 @@ $(call KernelPackage/$(1)/config) $(call KernelPackage/depends) - 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 y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) ifneq ($(strip $(FILES)),) define Package/kmod-$(1)/install - mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) - $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/ + @for mod in $$(FILES); do \ + if [ -e $$$$$$$$mod ]; then \ + mkdir -p $$(1)/$(MODULES_SUBDIR) ; \ + $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \ + elif [ -e "$(LINUX_DIR)/modules.builtin" ]; then \ + if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \ + echo "NOTICE: module '$$$$$$$$mod' is built-in."; \ + else \ + echo "ERROR: module '$$$$$$$$mod' is missing."; \ + exit 1; \ + fi; \ + else \ + echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in."; \ + fi; \ + done; $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) $(call KernelPackage/$(1)/install,$$(1)) endef @@ -152,14 +189,23 @@ $(call KernelPackage/$(1)/config) endef define AutoLoad - add_module $(1) "$(2)"; + add_module "$(1)" "$(2)" "$(3)"; endef +version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0) +kernel_version_merge=$$(( ($(call version_field,1,$(1)) << 24) + ($(call version_field,2,$(1)) << 16) + ($(call version_field,3,$(1)) << 8) + $(call version_field,4,$(1)) )) + ifdef DUMP - CompareKernelPatchVer=0 + kernel_version_cmp= else - define CompareKernelPatchVer - $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0) - endef + kernel_version_cmp=$(shell [ $(call kernel_version_merge,$(call split_version,$(2))) $(1) $(call kernel_version_merge,$(call split_version,$(3))) ] && echo 1 ) endif +CompareKernelPatchVer=$(if $(call kernel_version_cmp,-$(2),$(1),$(3)),1,0) + +kernel_patchver_gt=$(call kernel_version_cmp,-gt,$(KERNEL_PATCHVER),$(1)) +kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1)) +kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1)) +kernel_patchver_le=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1)) +kernel_patchver_lt=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1)) +