X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/da0444cb98e698043fa3b208e3dc80b82a928d03..78c205401ed5d3a55f0b5a92c098af8bf7145540:/include/kernel.mk?ds=sidebyside diff --git a/include/kernel.mk b/include/kernel.mk index 42c9cdf3a..2611828a3 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -18,12 +18,11 @@ else 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 + else ifneq ($(KERNEL_BUILD),1) - $(TOPDIR)/.kernel.mk: + # 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 @@ -95,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))