From: Michal Hrusecky Date: Thu, 11 Oct 2018 16:23:19 +0000 (+0200) Subject: build: Use LINUX_DIR for Kernel/Patch X-Git-Tag: v19.07.0-rc1~1414 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=37e91861cc6b1988531e2c68131d65053e7dd230;p=oweals%2Fopenwrt.git build: Use LINUX_DIR for Kernel/Patch Use LINUX_DIR as a path when patching kernel. Doesn't break the current usage, but allows to create packages that will contain variation of a kernel with kernel being build in some subdirectory of PKG_BUILD_DIR. Signed-off-by: Michal Hrusecky --- diff --git a/include/quilt.mk b/include/quilt.mk index 61dcc7964c..56f674a2f3 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -94,17 +94,17 @@ endef kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) define Kernel/Patch/Default - $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) + $(if $(QUILT),rm -rf $(LINUX_DIR)/patches; mkdir -p $(LINUX_DIR)/patches) $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/) find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f if [ -d $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) ]; then \ echo "generic patches directory is present. please move your patches to the pending directory" ; \ exit 1; \ fi - $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/) - $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/) - $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/) - $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/) + $(call PatchDir,$(LINUX_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/) + $(call PatchDir,$(LINUX_DIR),$(GENERIC_PATCH_DIR),generic/) + $(call PatchDir,$(LINUX_DIR),$(GENERIC_HACK_DIR),generic-hack/) + $(call PatchDir,$(LINUX_DIR),$(PATCH_DIR),platform/) endef define Quilt/RefreshDir