kernel: make LOCALVERSION consistent between recipes

The initial fix for localversion setting in 6.3+ broke older
recipes and also broke recipes setting localversion in a kernel
recipe, as make-mod-scripts (and other locations) can trigger
a regeneration of files and don't have access to the variable.

Moving the setting of this variable to the global namespace
doesn't make sense, so we follow the example of the kernel-abiversion
and save a kernel-localversion to the build artifacts.

Recipes that may regenerate scripts/dynamic files, must
depend on the do_shared_workedir of the kernel and use the helper
function to read the file storing the localversion.

(From OE-Core rev: cca0971a7d92d823cc0c2b16cf14a7b2ed8ecb61)

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

cherry-picked from master b378eec156998eea55ba61e59103cb34fab0d07c

Signed-off-by: Andreas Helbech Kleist <andreaskleist@gmail.com>
Acked-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Bruce Ashfield
2024-02-22 11:35:45 +01:00
committed by Steve Sakoman
parent 2b7c113459
commit 26f23535ee
6 changed files with 30 additions and 8 deletions

View File

@@ -33,6 +33,17 @@ def get_kernelversion_file(p):
except IOError:
return None
def get_kernellocalversion_file(p):
fn = p + '/kernel-localversion'
try:
with open(fn, 'r') as f:
return f.readlines()[0].strip()
except IOError:
return ""
return ""
def linux_module_packages(s, d):
suffix = ""
return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))