pixbufcache: Ensure that jpeg-native is available for postinst if necessary
PATCH 1/1 pixbufcache: Ensure that jpeg-native is available for postinst if necessary
pixbufcache_sstate_postinst expects to be able to call gdk-pixbuf-query-loaders which may be linked against libjpeg.so.8 so we'd better make sure jpeg-native is available in the sysroot.
--- meta/classes/pixbufcache.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/pixbufcache.bbclass +1 -0
@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \ " do_populate_sysroot_setscene[depends] += "${PIXBUFCACHE_SYSROOT_DEPS}" do_populate_sysroot[depends] += "${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')}"
Signature · 1 line
2.1.4
Quoted 14 lines · Mike Crowe
pixbufcache_sstate_postinstexpects to be able to call gdk-pixbuf-query-loaders which may be linked against libjpeg.so.8 so we'd better make sure jpeg-native is available in the sysroot.Signed-off-by Mike Crowe <[email protected]>--- meta/classes/pixbufcache.bbclass | 1 + 1 file changed, 1 insertion(+)meta/classes/pixbufcache.bbclass +0
-0
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 4 lines
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \
If this patch is deemed acceptable then perhaps a similar check against PACKAGECONFIG should be added to libpng-native?
Mike.
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 9 lines · Mike Crowe
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \
I'm not sure this is quite right. PACKAGECONFIG at the point this is expanded will be the PACKAGECONFIG for whatever recipe is currently inheriting pixbufcache.bbclass, whereas I think what you really need here is the PACKAGECONFIG that gdk-pixbuf itself was built with. Or, er, something.
p.
Quoted 16 lines · Phil Blundell
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 9 lines · Mike Crowe
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \I'm not sure this is quite right. PACKAGECONFIG at the point this is expanded will be the PACKAGECONFIG for whatever recipe is currently inheriting pixbufcache.bbclass, whereas I think what you really need here is the PACKAGECONFIG that gdk-pixbuf itself was built with. Or, er, something.
Right, its not that simple. As it happens I was just looking at this patch:
which I proposed a while ago which does solve this problem, with some ugliness in base.bbclass. I know Ross doesn't like it, neither do I, I do prefer it to the pretty horrible things PIXBUFCACHE_SYSROOT_DEPS does though.
Cheers,
Richard
Quoted 21 lines · Richard Purdie
Quoted 16 lines · Phil Blundell
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 9 lines · Mike Crowe
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \I'm not sure this is quite right. PACKAGECONFIG at the point this is expanded will be the PACKAGECONFIG for whatever recipe is currently inheriting pixbufcache.bbclass, whereas I think what you really need here is the PACKAGECONFIG that gdk-pixbuf itself was built with. Or, er, something.
Right, its not that simple. As it happens I was just looking at this patch:
Quoted 6 lines
which I proposed a while ago which does solve this problem, with some ugliness in base.bbclass. I know Ross doesn't like it, neither do I, I do prefer it to the pretty horrible things
PIXBUFCACHE_SYSROOT_DEPSdoes though.
Based on my (probably incomplete) understanding of the problem and your solution:
The setscene tasks for libpng-native, jpeg-native etc. will all be run automatically as setscene tasks. The problem is that they might not run before pixbufcache_sstate_postinst does.
The existing hack, which I extended inexpertly, ensured that the setscene tasks run in the right order so that libpng-native, jpeg-native etc. are definitely present in the sysroot prior to pixbufcache_sstate_postinst running.
Would it be possible to make your change less "ugly" by making it more generic. For example, adding a companion to SSTATEPOSTINSTFUNCS named SSTATELATEPOSTINSTFUNCS that runs at the sceneQueueComplete event?
Alternatively, I'm afraid that I don't understand why pixbufcache.bbclass can't have its own event handler which would at least keep the ugliness in a single file.
Having said all that, I'm slightly worried about what would happen if gdk-pixbuf-native were to be resurrected from sstate but jpeg-native could not be (e.g. perhaps the file has gone missing.) The end of setscene would still be too early to run the postinst in that case. I've not experimented to see if this can really happen though.
I'm prepared to have a go at trying to fix this in an acceptable way but I'm not really sure how to go about it. :(
Thanks.
Mike.
Quoted 16 lines · Phil Blundell
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 9 lines · Mike Crowe
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \I'm not sure this is quite right. PACKAGECONFIG at the point this is expanded will be the PACKAGECONFIG for whatever recipe is currently inheriting pixbufcache.bbclass, whereas I think what you really need here is the PACKAGECONFIG that gdk-pixbuf itself was built with. Or, er, something.
The problem I was seeing was with gdk-pixbuf itself so it sounds like I need to add the dependency only when '${BPN}' == 'gdk-pixbuf' itself. I'll have a go at that.
Thanks.
Mike.
Quoted 18 lines · Mike Crowe
Quoted 16 lines · Phil Blundell
meta/classes/pixbufcache.bbclass PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ · line 75
Quoted 9 lines · Mike Crowe
meta/classes/pixbufcache.bbclass +1
-0@@ -72,6 +72,7 @@ PIXBUFCACHE_SYSROOT_DEPS_class-native = "\ glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ harfbuzz-native:do_populate_sysroot_setscene \ + ${@bb.utils.contains('PACKAGECONFIG', 'jpeg', 'jpeg-native:do_populate_sysroot_setscene', '', d)} \I'm not sure this is quite right. PACKAGECONFIG at the point this is expanded will be the PACKAGECONFIG for whatever recipe is currently inheriting pixbufcache.bbclass, whereas I think what you really need here is the PACKAGECONFIG that gdk-pixbuf itself was built with. Or, er, something.
Quoted 3 lines
The problem I was seeing was with gdk-pixbuf itself so it sounds like I need to add the dependency only when '${BPN}' == 'gdk-pixbuf' itself. I'll have a go at that.
I'm still not convinced this is the right route to go down. I'd much rather find a way to improve my other patch with the right abstractions, or just accept the ugliness in base.bbclass...
Cheers,
Richard