X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fkernel.mk;h=63df959a48b682f8a6dd07f57bace33d043875fd;hp=ee4d4b8dc648c63a496030327aeb1da24ed63a07;hb=391eb6e69c09d9f107b8c30a91c63dce37820043;hpb=64dc8b1d34714ae583e3166f85bacb95e1929f15 diff --git a/include/kernel.mk b/include/kernel.mk index ee4d4b8dc..63df959a4 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -30,8 +30,10 @@ 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) @@ -42,7 +44,9 @@ else 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)),) + 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)) @@ -68,6 +72,9 @@ define ModuleAutoLoad add_module() { \ mkdir -p $(2)/etc/modules.d; \ ( \ + [ "$$$$$$$$3" = "1" ] && { \ + echo '# May be required for rootfs' ; \ + } ; \ for mod in $$$$$$$$2; do \ getvar mod; \ done \ @@ -152,7 +159,7 @@ $(call KernelPackage/$(1)/config) endef define AutoLoad - add_module $(1) "$(2)"; + add_module $(1) "$(2)" $(3); endef ifdef DUMP