diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 17:06:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 21:57:48 +0000 |
commit | 7d28e8339931c0af88cdf00b8fd6f2b451b5bac9 (patch) | |
tree | 276d3d91ab878c0e423ab8533d7cbef687d22ed3 /meta | |
parent | 3d8b241cf2d76d2ef0b723b27fcd7e7e00bd69dc (diff) | |
download | poky-7d28e8339931c0af88cdf00b8fd6f2b451b5bac9.tar.gz |
oeqa/selftest/devtool: Fix for linux 6.1 versions onwards
In recent kernel versions the string "Linux" moved to a header,
'include/linux/uts.h' instead of init/version.c. Allow the test
to work with both situations.
(From OE-Core rev: c15c59c88d229e35eeac1ed948c84168633e7cb1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index c78a68be5b..86014d2557 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -2040,7 +2040,9 @@ class DevtoolUpgradeTests(DevtoolBase): | |||
2040 | 2040 | ||
2041 | #Modify the kernel source | 2041 | #Modify the kernel source |
2042 | modfile = os.path.join(tempdir, 'init/version.c') | 2042 | modfile = os.path.join(tempdir, 'init/version.c') |
2043 | runCmd("sed -i 's/Linux/LiNuX/g' %s" % (modfile)) | 2043 | # Moved to uts.h in 6.1 onwards |
2044 | modfile2 = os.path.join(tempdir, 'include/linux/uts.h') | ||
2045 | runCmd("sed -i 's/Linux/LiNuX/g' %s %s" % (modfile, modfile2)) | ||
2044 | 2046 | ||
2045 | #Modify the configuration | 2047 | #Modify the configuration |
2046 | codeconfigfile = os.path.join(tempdir, '.config.new') | 2048 | codeconfigfile = os.path.join(tempdir, '.config.new') |