X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4c98f8465d7b207b150b3c67705e35297d7804be..11f6a780e57e9febfa701f688575dfc79cc1f970:/include/kernel.mk diff --git a/include/kernel.mk b/include/kernel.mk index af5d9455f..2611828a3 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -19,10 +19,12 @@ else 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 + ifneq ($(KERNEL_BUILD),1) + # 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 endif ifeq ($(KERNEL),2.6) @@ -92,7 +94,7 @@ define KernelPackage CATEGORY:=Kernel modules DEFAULT:=m DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:='kernel (=$(PKG_VERSION)-$(PKG_RELEASE))' + EXTRA_DEPENDS:='kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(KERNEL)) $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))