X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e52b00c08077ea9d8a8c7dac30be9c98d0ad833..4aedc68034a5aeb08a393a852609695e19e01beb:/include/kernel.mk diff --git a/include/kernel.mk b/include/kernel.mk index 5d5c9e917..4744e09ef 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -14,14 +14,12 @@ ifeq ($(DUMP),1) BOARD?= LINUX_VERSION?= 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 +28,32 @@ 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_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)),) + 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)) @@ -53,12 +64,7 @@ ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH=um else ifeq (,$(LINUX_KARCH)) - LINUX_KARCH=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/x86/' \ - -e 's/mipsel/mips/' \ - -e 's/mipseb/mips/' \ - -e 's/sh[234]/sh/' \ - -e 's/armeb/arm/' \ - ) + 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 endif @@ -69,19 +75,28 @@ define KernelPackage/Defaults endef define ModuleAutoLoad + $(SH_FUNC) \ export modules=; \ add_module() { \ + priority="$$$$$$$$1"; \ + mods="$$$$$$$$2"; \ + boot="$$$$$$$$3"; \ + shift 3; \ mkdir -p $(2)/etc/modules.d; \ ( \ - for mod in $$$$$$$$2; do \ - getvar mod; \ + [ "$$$$$$$$boot" = "1" ] && { \ + echo '# May be required for rootfs' ; \ + } ; \ + for mod in $$$$$$$$mods; do \ + echo "$$$$$$$$mod"; \ done \ - ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \ - modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \ + ) > $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ + modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ }; \ $(3) \ if [ -n "$$$$$$$$modules" ]; then \ mkdir -p $(2)/etc/modules.d; \ + 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; \ @@ -105,19 +120,17 @@ 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)-$(BOARD)-$(LINUX_RELEASE)) - VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(BOARD)-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)) + 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)-$(KERNEL)) + $(call KernelPackage/$(1)/$(BOARD)) endef ifdef KernelPackage/$(1)/description @@ -137,8 +150,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 ($(strip $(FILES)),) define Package/kmod-$(1)/install - mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) - $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/ + mkdir -p $$(1)/$(MODULES_SUBDIR) + $(CP) -L $$(FILES) $$(1)/$(MODULES_SUBDIR)/ $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) $(call KernelPackage/$(1)/install,$$(1)) endef @@ -156,14 +169,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,-lt,$(KERNEL_PATCHVER),$(1)) +kernel_patchver_lt=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1)) +