X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fkernel.mk;h=b82668ea48d1755d6fada59b7b07788e8ad75083;hp=92738172506d841a3332315194aef3fc51c3e0fc;hb=6db7ad74f61eeaae0c8ecb08d483599d9d80c53f;hpb=b7b4cc7ec32a51be920d1d224ba5914ec236c58f diff --git a/include/kernel.mk b/include/kernel.mk index 927381725..b82668ea4 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -4,26 +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) - LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE) - LINUX_KARCH:=$(CONFIG_LINUX_KARCH) - 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 @@ -31,16 +22,7 @@ else LINUX_KMOD_SUFFIX=o endif - 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:= else @@ -48,21 +30,37 @@ else KERNEL_CROSS:=$(TARGET_CROSS) endif - KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) - LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) + 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,) + LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \ + + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) +endif + +ifneq (,$(findstring uml,$(BOARD))) + LINUX_KARCH:=um +else + 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/' \ + ) endif define KernelPackage/Defaults FILES:= - KCONFIG:=m AUTOLOAD:= endef @@ -70,7 +68,11 @@ define ModuleAutoLoad export modules=; \ add_module() { \ mkdir -p $(2)/etc/modules.d; \ - echo "$$$$$$$$2" > $(2)/etc/modules.d/$$$$$$$$1-$(1); \ + ( \ + for mod in $$$$$$$$2; do \ + getvar mod; \ + done \ + ) > $(2)/etc/modules.d/$$$$$$$$1-$(1); \ modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$1-$(1)"; \ }; \ $(3) \ @@ -87,6 +89,7 @@ endef define KernelPackage NAME:=$(1) + $(eval $(call Package/Default)) $(eval $(call KernelPackage/Defaults)) $(eval $(call KernelPackage/$(1))) $(eval $(call KernelPackage/$(1)/$(KERNEL))) @@ -96,74 +99,37 @@ define KernelPackage TITLE:=$(TITLE) SECTION:=kernel CATEGORY:=Kernel modules - DEFAULT:=m DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))' + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) + VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(BOARD)-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(KERNEL)) $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)) endef - ifeq ($(findstring m,$(KCONFIG)),m) + ifdef KernelPackage/$(1)/description + define Package/kmod-$(1)/description +$(call KernelPackage/$(1)/description) + endef + endif + + # check that all CONFIG_* symbols in $(KCONFIG) are set to 'm' + ifeq ($(filter-out m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$(if $($(c)),$($(c)),n))),) ifneq ($(strip $(FILES)),) define Package/kmod-$(1)/install - mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) - $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/ - $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) - $(call KernelPackage/$(1)/install,$$(1)) + 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 endif $$(eval $$(call BuildPackage,kmod-$(1))) + + $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES)) endef define AutoLoad add_module $(1) "$(2)"; endef - -# FIXME: remove this crap -define KMOD_template -ifeq ($$(strip $(4)),) -KDEPEND_$(1):=m -else -KDEPEND_$(1):=$($(4)) -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) - -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 - -$$(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 -endif - $(8) - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) -endef -