From 1788ef14ced19a47e97f692b1691585c43360334 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Thu, 18 Aug 2016 13:19:58 -0700 Subject: [PATCH] Allow overrides of the patch series. --- make/kbuild.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/make/kbuild.mk b/make/kbuild.mk index 1f9f71d9..eb28a1b1 100644 --- a/make/kbuild.mk +++ b/make/kbuild.mk @@ -56,6 +56,13 @@ ifndef K_PATCH_DIR $(error $$K_PATCH_DIR must be set) endif +ifndef K_PATCH_SERIES_FILE + ifndef K_PATCH_SERIES + K_PATCH_SERIES = series + endif + K_PATCH_SERIES_FILE = $(K_PATCH_DIR)/$(K_PATCH_SERIES) +endif + # # This is the directory that will receive the build targets. # The kernel build tree is placed in this directory, @@ -125,7 +132,7 @@ ksource: $(K_SOURCE_DIR)/Makefile # The patched kernel sources # $(K_SOURCE_DIR)/.PATCHED: $(K_SOURCE_DIR)/Makefile - $(ONL)/tools/scripts/apply-patches.sh $(K_SOURCE_DIR) $(K_PATCH_DIR) + $(ONL)/tools/scripts/apply-patches.sh $(K_SOURCE_DIR) $(K_PATCH_DIR) $(K_PATCH_SERIES_FILE) touch $(K_SOURCE_DIR)/.PATCHED kpatched: $(K_SOURCE_DIR)/.PATCHED