X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/75d25b95d52ac80837a2b5c0880acf2ee7e3c854..b54f30fc99f6598f94eeaeee7199732255ef5fb0:/include/kernel.mk?ds=sidebyside diff --git a/include/kernel.mk b/include/kernel.mk index 7d986e459..a9a350bb2 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -31,7 +31,7 @@ else endif PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) - FILES_DIR ?= ./files$(shell [ -d "./files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) + 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) @@ -126,7 +126,9 @@ $(call KernelPackage/$(1)/config) endef endif - ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),) + $(STAMP_BUILT): $(LINUX_DIR)/.config + + 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)