config.json: add binutils to images where it's required by tests
PATCH 1/1 config.json: add binutils to images where it's required by tests
Previously it was pulled in implicitly via poky default config.
--- config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
config.json +3 -2
@@ -452,6 +452,7 @@ "step2" : { "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ + "IMAGE_INSTALL_append = ' binutils'", "TEST_SUITES_append = ' x32lib'" ] }
@@ -501,7 +502,7 @@ "MULTILIBS = 'multilib:lib32'", "DEFAULTTUNE_virtclass-multilib-lib32 = 'x86'", "RPM_PREFER_ELF_ARCH = '1'", - "IMAGE_INSTALL_append = ' lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" + "IMAGE_INSTALL_append = ' binutils lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" ] }, "step4" : {
@@ -514,7 +515,7 @@ "MULTILIBS = 'multilib:lib32'", "DEFAULTTUNE_virtclass-multilib-lib32 = 'x86'", "RPM_PREFER_ELF_ARCH = '1'", - "IMAGE_INSTALL_append = ' lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" + "IMAGE_INSTALL_append = ' binutils lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" ] }, "step5" : {
Signature · 1 line
2.28.0
Quoted 29 lines · Alexander Kanavin
Previously it was pulled in implicitly via poky default config.
Signed-off-by Alexander Kanavin <[email protected]>--- config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)config.json +2
-1@@ -452,6 +452,7 @@ "step2" : { "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ + "IMAGE_INSTALL_append = ' binutils'", "TEST_SUITES_append = ' x32lib'" ] }@@ -501,7 +502,7 @@ "MULTILIBS = 'multilib:lib32'", "DEFAULTTUNE_virtclass-multilib-lib32 = 'x86'", "RPM_PREFER_ELF_ARCH = '1'", - "IMAGE_INSTALL_append = ' lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" + "IMAGE_INSTALL_append = ' binutils lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" ] }, "step4" : {
config.json line 521
Quoted 8 lines
config.json +1
-1@@ -514,7 +515,7 @@ "MULTILIBS = 'multilib:lib32'", "DEFAULTTUNE_virtclass-multilib-lib32 = 'x86'", "RPM_PREFER_ELF_ARCH = '1'", - "IMAGE_INSTALL_append = ' lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" + "IMAGE_INSTALL_append = ' binutils lib32-connman-gnome gdk-pixbuf-loader-jpeg lib32-gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png lib32-gdk-pixbuf-loader-png pango-module-basic-fc lib32-pango-module-basic-fc'" ] }, "step5" : {
I suspect we need binutils-symlinks instead of binutils?
Also, thinking about this more, why aren't these tests scp'ing the file to the host system and running readelf there? That would remove the need for the dependency?
Cheers,
Richard
Quoted 2 lines · Richard Purdie
I suspect we need binutils-symlinks instead of binutils?
binutils-symlinks is only an alias to the main package according to binutils.inc:
RPROVIDES_${PN} += "${PN}-symlinks"
Quoted 4 lines
Also, thinking about this more, why aren't these tests scp'ing the file to the host system and running readelf there? That would remove the need for the dependency?
I didn't write either of the tests, but yes - I can work on this tomorrow.
Alex
Quoted 8 lines · Alexander Kanavin
Quoted 1 line · Richard Purdie
I suspect we need binutils-symlinks instead of binutils?
binutils-symlinks is only an alias to the main package according to binutils.inc:
RPROVIDES_${PN} += "${PN}-symlinks"
Fair enough, I suspect I'm getting it confused with gcc-symlinks.
Quoted 7 lines
Quoted 4 lines
Also, thinking about this more, why aren't these tests scp'ing the file
to the host system and running readelf there? That would remove the need for the dependency?I didn't write either of the tests, but yes - I can work on this
tomorrow.
Right, I didn't write them either, they're rather old. I'm just thinking whilst we've gotten this far we may as well fix this properly and stop it being copy and pasted onward. I appreciate the help!
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 2 lines
I didn't write either of the tests, but yes - I can work on this
tomorrow.Right, I didn't write them either, they're rather old. I'm just thinking whilst we've gotten this far we may as well fix this properly and stop it being copy and pasted onward. I appreciate the help!
And done, patches sent :) Bonus fix: one of the multilib tests was erroneously always skipped.
Alex
Quoted 5 lines · Alexander Kanavin
Quoted 3 lines · Richard Purdie
Quoted 2 lines
I didn't write either of the tests, but yes - I can work on this
tomorrow.
Quoted 7 lines
Quoted 4 lines
Right, I didn't write them either, they're rather old. I'm just thinking whilst we've gotten this far we may as well fix this properly
and stop it being copy and pasted onward. I appreciate the help!And done, patches sent :) Bonus fix: one of the multilib tests was erroneously always skipped.
Thanks, much appreciated!
I had a question on the skipped test. I think its only applicable to one specific multilib test case...
Cheers,
Richard