X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3f494f8d220f2b1a40a6749e814b46eca48792ac..f7aa72ae435885a8f5d5ad4c9b149c20a1e36c0d:/include/kernel.mk diff --git a/include/kernel.mk b/include/kernel.mk index c788bf1c4..1ca231282 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -4,25 +4,17 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifeq ($(DUMP),1) - KERNEL:= - BOARD:= - LINUX_VERSION:= -else - include $(TOPDIR)/.kernel.mk +ifeq ($(__target_inc),) include $(INCLUDE_DIR)/target.mk +endif - # check to see if .kernel.mk matches target.mk - ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) - LINUX_VERSION:=$(CONFIG_LINUX_VERSION) - RELEASE:=$(CONFIG_RELEASE) - else - # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) - $(warning rebuilding .kernel.mk) - $(TOPDIR)/.kernel.mk: FORCE - @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null - endif +ifeq ($(DUMP),1) + KERNEL?= + BOARD?= + LINUX_VERSION?= +else + export GCC_HONOUR_COPTS=s ifeq ($(KERNEL),2.6) LINUX_KMOD_SUFFIX=ko @@ -30,84 +22,149 @@ else LINUX_KMOD_SUFFIX=o endif - LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ - -e 's/mipsel/mips/' \ - -e 's/mipseb/mips/' \ - -e 's/powerpc/ppc/' \ - -e 's/sh[234]/sh/' \ - -e 's/armeb/arm/' \ - ) - - KERNELNAME= - ifneq (,$(findstring x86,$(BOARD))) - KERNELNAME="bzImage" - endif - ifneq (,$(findstring ppc,$(BOARD))) - KERNELNAME="uImage" - endif - ifneq (,$(findstring uml,$(BOARD))) - LINUX_KARCH:=um - KERNEL_CC:=$(HOSTCC) - KERNEL_CROSS:= + KERNEL_CC?=$(HOSTCC) + KERNEL_CROSS?= else - KERNEL_CC:=$(TARGET_CC) - KERNEL_CROSS:=$(TARGET_CROSS) + KERNEL_CC?=$(TARGET_CC) + KERNEL_CROSS?=$(TARGET_CROSS) endif - KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) - LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) + FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)") + 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) - MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) - KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux + + LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 + TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) + ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE)),) + LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) + endif + + ifneq ($(TARGET_BUILD),1) + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) + endif endif -# FIXME: remove this crap -define KMOD_template -ifeq ($$(strip $(4)),) -KDEPEND_$(1):=m +ifneq (,$(findstring uml,$(BOARD))) + LINUX_KARCH=um else -KDEPEND_$(1):=$($(4)) + 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 endif -IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)") -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk -I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) +define KernelPackage/Defaults + FILES:= + AUTOLOAD:= +endef -ifeq ($$(KDEPEND_$(1)),m) -ifneq ($$(CONFIG_PACKAGE_KMOD_$(1)),) -TARGETS += $$(PKG_$(1)) -endif -ifeq ($$(CONFIG_PACKAGE_KMOD_$(1)),y) -INSTALL_TARGETS += $$(PKG_$(1)) -endif -endif +define ModuleAutoLoad + export modules=; \ + add_module() { \ + mkdir -p $(2)/etc/modules.d; \ + ( \ + [ "$$$$$$$$3" = "1" ] && { \ + echo '# May be required for rootfs' ; \ + } ; \ + for mod in $$$$$$$$2; do \ + getvar mod; \ + done \ + ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \ + modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(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; \ + echo "load_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ + chmod 0755 $(2)/CONTROL/postinst; \ + fi +endef -$$(PKG_$(1)): $(LINUX_DIR)/.modules_done - rm -rf $$(I_$(1)) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) - echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control -ifneq ($(strip $(3)),) - mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) -endif -ifneq ($(6),) - mkdir -p $$(I_$(1))/etc/modules.d - for module in $(7); do \ - echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \ - done - echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst - echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst - echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst - echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst - chmod 0755 $$(I_$(1))/CONTROL/postinst +ifeq ($(DUMP)$(TARGET_BUILD),) + -include $(LINUX_DIR)/.config endif - $(8) - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) + +define KernelPackage/depends + $(STAMP_BUILT): $(LINUX_DIR)/.config + define KernelPackage/depends + endef +endef + +define KernelPackage + NAME:=$(1) + $(eval $(call Package/Default)) + $(eval $(call KernelPackage/Defaults)) + $(eval $(call KernelPackage/$(1))) + $(eval $(call KernelPackage/$(1)/$(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)) + 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 + + ifdef KernelPackage/$(1)/description + define Package/kmod-$(1)/description +$(call KernelPackage/$(1)/description) + endef + endif + + ifdef KernelPackage/$(1)/config + define Package/kmod-$(1)/config +$(call KernelPackage/$(1)/config) + endef + endif + + $(call KernelPackage/depends) + + 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)/ + $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) + $(call KernelPackage/$(1)/install,$$(1)) + endef + 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" + ) + endif + $$(eval $$(call BuildPackage,kmod-$(1))) + + $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES)) endef +define AutoLoad + add_module $(1) "$(2)" $(3); +endef + +ifdef DUMP + CompareKernelPatchVer=0 +else + define CompareKernelPatchVer + $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0) + endef +endif +