| Message ID | 20230126171648.2527833-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | c15c59c88d229e35eeac1ed948c84168633e7cb1 |
| Headers | show |
| Series | [1/2] oeqa/selftest/devtool: Fix for linux 6.1 versions onwards | expand |
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index c78a68be5b4..86014d25576 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2040,7 +2040,9 @@ class DevtoolUpgradeTests(DevtoolBase): #Modify the kernel source modfile = os.path.join(tempdir, 'init/version.c') - runCmd("sed -i 's/Linux/LiNuX/g' %s" % (modfile)) + # Moved to uts.h in 6.1 onwards + modfile2 = os.path.join(tempdir, 'include/linux/uts.h') + runCmd("sed -i 's/Linux/LiNuX/g' %s %s" % (modfile, modfile2)) #Modify the configuration codeconfigfile = os.path.join(tempdir, '.config.new')
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/lib/oeqa/selftest/cases/devtool.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)