tipspkernel: add extra level to FILESPATH with major version in the name

Add PMV variable to contain major version by extracting first 2 numbers from PV
Insert new level to FILESPATH - PN-PV-PR:PN-PV:PN-PMV:PN:files:.
Allow keeping patches and configs generic for the series (i.e. 3.2) while
incrementing stable releases (i.e. 3.2.18)
Drop use of BP and BPN, as they don't change for the kernel

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Acked-by: Koen Kooi <koen@circuitco.com>

diff --git a/recipes-kernel/linux/tipspkernel.inc b/recipes-kernel/linux/tipspkernel.inc
index c23fa57788b7ba4cfaf81385621251ff321275b5..ba93530f76a2dcc0860e7ed475f472c3796f402a 100644 (file)
--- a/recipes-kernel/linux/tipspkernel.inc
+++ b/recipes-kernel/linux/tipspkernel.inc
@@ -1,11 +1,26 @@
 # Include this file for kernel recipes that need to handle different defconfigs
 # and apply patches based on "tipspkernel" DISTRO_FEATURES
 
+def get_major_pv(p):
+       import re
+       r = re.compile("([0-9]+\.[0-9]+).*")
+       m = r.match(p);
+       if m:
+               return m.group(1)
+       return None
+
+PMV = "${@get_major_pv(d.getVar('PV', True))}"
+
+# First of all, set own FILESPATH avoiding unnecessary BP and BPN, but adding
+# extra level of major version
+FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}-${PMV}", \
+"${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+
 # We don't want "tipspkernel" to be another OVERRIDE, but rather a new level of
 # FILESPATH with all the OVERRIDES applied to it
 CONFIGS_PSP = "${@base_set_filespath(["${FILE_DIRNAME}/${PF}/tipspkernel", "${FILE_DIRNAME}/${P}/tipspkernel", \
-"${FILE_DIRNAME}/${PN}/tipspkernel", "${FILE_DIRNAME}/${BP}/tipspkernel", "${FILE_DIRNAME}/${BPN}/tipspkernel", \
-"${FILE_DIRNAME}/files/tipspkernel", "${FILE_DIRNAME}/tipspkernel"], d)}:"
+"${FILE_DIRNAME}/${PN}-${PMV}/tipspkernel", "${FILE_DIRNAME}/${PN}/tipspkernel", "${FILE_DIRNAME}/files/tipspkernel", \
+"${FILE_DIRNAME}/tipspkernel"], d)}:"
 
 # When "tipspkernel" is ENABLED, prepend additional set of directories to FILESPATH
 FILESPATH =. "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "${CONFIGS_PSP}", "", d)}"