X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fkernel.mk;h=700736fe9a77e66890945955d1689749603701bb;hp=589db024db64ca2bf182c05d190c9f6f83d58691;hb=a19b69a717e277fe517d71e50807c71b84ac9738;hpb=720ccbd95de4208bea19a73c48e57079804bf98e diff --git a/include/kernel.mk b/include/kernel.mk index 589db024db..700736fe9a 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org +# +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -35,7 +35,7 @@ else endif KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)) LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) - + LINUX_UAPI_DIR=uapi/ LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null)) LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown) @@ -52,7 +52,7 @@ else LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) - LINUX_SITE:=@KERNEL/linux/kernel/v3.x$(TESTING) + LINUX_SITE:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(KERNEL_BASE))).x$(TESTING) endif ifneq ($(TARGET_BUILD),1) @@ -62,13 +62,20 @@ endif ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH=um +else ifneq (,$(findstring $(ARCH), aarch64 aarch64_be)) + LINUX_KARCH := arm64 +else ifneq (,$(findstring $(ARCH), armeb)) + LINUX_KARCH := arm +else ifneq (,$(findstring $(ARCH), mipsel mips64 mips64el)) + LINUX_KARCH := mips +else ifneq (,$(findstring $(ARCH), sh2 sh3 sh4)) + LINUX_KARCH := sh +else ifneq (,$(findstring $(ARCH), i386 x86_64)) + LINUX_KARCH := x86 else - ifeq (,$(LINUX_KARCH)) - LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH)))))))))) - endif + LINUX_KARCH := $(ARCH) endif - define KernelPackage/Defaults FILES:= AUTOLOAD:= @@ -77,16 +84,30 @@ endef define ModuleAutoLoad $(SH_FUNC) \ export modules=; \ + probe_module() { \ + mods="$$$$$$$$1"; \ + boot="$$$$$$$$2"; \ + shift 2; \ + for mod in $$$$$$$$mods; do \ + mkdir -p $(2)/etc/modules.d; \ + echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \ + done; \ + if [ -e $(2)/etc/modules.d/$(1) ]; then \ + if [ "$$$$$$$$boot" = "1" ]; then \ + mkdir -p $(2)/etc/modules-boot.d; \ + ln -s ../modules.d/$(1) $(2)/etc/modules-boot.d/; \ + fi; \ + modules="$$$$$$$${modules:+$$$$$$$$modules}"; \ + fi; \ + }; \ add_module() { \ 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; \ + mkdir -p $(2)/etc/modules.d; \ + echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ done; \ if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \ if [ "$$$$$$$$boot" = "1" ]; then \ @@ -102,8 +123,8 @@ define ModuleAutoLoad mkdir -p $(2)/CONTROL; \ echo "#!/bin/sh" > $(2)/CONTROL/postinst; \ echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \ - echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \ - echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ + echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst; \ + echo "insert_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ chmod 0755 $(2)/CONTROL/postinst; \ fi endef @@ -136,6 +157,12 @@ define KernelPackage $(call KernelPackage/$(1)/$(BOARD)) endef + ifdef KernelPackage/$(1)/conffiles + define Package/kmod-$(1)/conffiles +$(call KernelPackage/$(1)/conffiles) + endef + endif + ifdef KernelPackage/$(1)/description define Package/kmod-$(1)/description $(call KernelPackage/$(1)/description) @@ -151,9 +178,9 @@ $(call KernelPackage/$(1)/config) $(call KernelPackage/depends) ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) - ifneq ($(strip $(FILES)),) + ifneq ($(if $(SDK),$(filter-out $(LINUX_DIR)/%.ko,$(FILES)),$(strip $(FILES))),) define Package/kmod-$(1)/install - @for mod in $$(FILES); do \ + @for mod in $$(call version_filter,$$(FILES)); do \ if [ -e $$$$$$$$mod ]; then \ mkdir -p $$(1)/$(MODULES_SUBDIR) ; \ $(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \ @@ -161,11 +188,11 @@ $(call KernelPackage/$(1)/config) 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."; \ + echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \ exit 1; \ fi; \ else \ - echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in."; \ + echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in." >&2; \ fi; \ done; $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) @@ -174,9 +201,13 @@ $(call KernelPackage/$(1)/config) endif $(if $(CONFIG_PACKAGE_kmod-$(1)), else - compile: kmod-$(1)-unavailable - kmod-$(1)-unavailable: - @echo "WARNING: kmod-$(1) is not available in the kernel config" + compile: $(1)-disabled + $(1)-disabled: + @echo "WARNING: kmod-$(1) is not available in the kernel config - generating empty package" >&2 + + define Package/kmod-$(1)/install + true + endef ) endif $$(eval $$(call BuildPackage,kmod-$(1))) @@ -184,8 +215,14 @@ $(call KernelPackage/$(1)/config) $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES)) endef +version_filter=$(if $(findstring @,$(1)),$(shell $(SCRIPT_DIR)/metadata.pl version_filter $(KERNEL_PATCHVER) $(1)),$(1)) + define AutoLoad - add_module "$(1)" "$(2)" "$(3)"; + add_module "$(1)" "$(call version_filter,$(2))" "$(3)"; +endef + +define AutoProbe + probe_module "$(call version_filter,$(1))" "$(2)"; endef version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0)