diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-02-22 11:35:45 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-03-01 05:19:54 -1000 |
commit | 26f23535eef1f3314c42cd00cda0c6da7cdaf9af (patch) | |
tree | 23dbb577e2732eafb663b553fd95484b09386e62 /meta/classes/linux-kernel-base.bbclass | |
parent | 2b7c113459a602c91badaa7543d02811feac0151 (diff) | |
download | poky-26f23535eef1f3314c42cd00cda0c6da7cdaf9af.tar.gz |
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>
Diffstat (limited to 'meta/classes/linux-kernel-base.bbclass')
-rw-r--r-- | meta/classes/linux-kernel-base.bbclass | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index 73a6fe36d9..0e2a4a4abe 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass | |||
@@ -33,6 +33,17 @@ def get_kernelversion_file(p): | |||
33 | except IOError: | 33 | except IOError: |
34 | return None | 34 | return None |
35 | 35 | ||
36 | def get_kernellocalversion_file(p): | ||
37 | fn = p + '/kernel-localversion' | ||
38 | |||
39 | try: | ||
40 | with open(fn, 'r') as f: | ||
41 | return f.readlines()[0].strip() | ||
42 | except IOError: | ||
43 | return "" | ||
44 | |||
45 | return "" | ||
46 | |||
36 | def linux_module_packages(s, d): | 47 | def linux_module_packages(s, d): |
37 | suffix = "" | 48 | suffix = "" |
38 | return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) | 49 | return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) |