* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
[not found] <20150316174236.48B8050234@opal.openembedded.org>
@ 2015-03-21 2:11 ` Martin Jansa
2015-03-21 9:29 ` Richard Purdie
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-21 2:11 UTC (permalink / raw)
To: openembedded-core, Jonathan Liu; +Cc: openembedded-commits
[-- Attachment #1: Type: text/plain, Size: 2636 bytes --]
On Mon, Mar 16, 2015 at 05:42:36PM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f0e3db4eaacc32423934ce09b91bc619dc5dbd21
>
> Author: Jonathan Liu <net147@gmail.com>
> Date: Mon Mar 9 12:13:56 2015 +1100
>
> fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
>
> Appending to PACKAGEFUNCS results in the font packages missing the
> postinst/postrm scripts and the fontconfig cache not being generated
> in /var/cache/fontconfig when creating images or installing font
> packages. This is because the package data has already been emitted
> by emit_pkgdata in PACKAGEFUNCS. Prepend to PACKAGEFUNCS to ensure
> add_fontcache_postinsts is executed before emit_pkgdata.
It's not caused by this change, but fixing this issue revealed that
fc-cache doesn't really work here.
Every time the intercept_scripts/update_font_cache executes qemu it gets
"stuck" eating a lot of cpu and memory until it dies. Is anyone alse
seeing this behavior?
WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code: 137)! See log for details!
WARNING: The postinstalls for the following packages will be postponed for first boot: liberation-fonts
ERROR: The following packages could not be configured offline and rootfs is read-only: ['liberation-fonts']
ERROR: Function failed: do_rootfs
bitbake 32618 98.8 67.1 11031512 10983420 pts/3 R+ 03:00 4:53
qemu-i386 -r 2.6.32 -L /OE/rootfs -E uD_LIBRARY_PATH=/OE/rootfs//usr/lib:/OE/rootfs//lib /OE/rootfs/usr/bin/fc-cache --sysroot=/OE/rootfs
>
> [YOCTO #7410]
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> ---
>
> meta/classes/fontcache.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> index ad5892c..dfbdfa1 100644
> --- a/meta/classes/fontcache.bbclass
> +++ b/meta/classes/fontcache.bbclass
> @@ -42,4 +42,4 @@ python add_fontcache_postinsts() {
> d.setVar('pkg_postrm_%s' % pkg, postrm)
> }
>
> -PACKAGEFUNCS += "add_fontcache_postinsts"
> +PACKAGEFUNCS =+ "add_fontcache_postinsts"
>
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-21 2:11 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Martin Jansa
@ 2015-03-21 9:29 ` Richard Purdie
2015-03-21 14:55 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Richard Purdie @ 2015-03-21 9:29 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-commits, openembedded-core
On Sat, 2015-03-21 at 03:11 +0100, Martin Jansa wrote:
> On Mon, Mar 16, 2015 at 05:42:36PM +0000, git@git.openembedded.org wrote:
> > Module: openembedded-core.git
> > Branch: master
> > Commit: f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> >
> > Author: Jonathan Liu <net147@gmail.com>
> > Date: Mon Mar 9 12:13:56 2015 +1100
> >
> > fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
> >
> > Appending to PACKAGEFUNCS results in the font packages missing the
> > postinst/postrm scripts and the fontconfig cache not being generated
> > in /var/cache/fontconfig when creating images or installing font
> > packages. This is because the package data has already been emitted
> > by emit_pkgdata in PACKAGEFUNCS. Prepend to PACKAGEFUNCS to ensure
> > add_fontcache_postinsts is executed before emit_pkgdata.
>
> It's not caused by this change, but fixing this issue revealed that
> fc-cache doesn't really work here.
>
> Every time the intercept_scripts/update_font_cache executes qemu it gets
> "stuck" eating a lot of cpu and memory until it dies. Is anyone alse
> seeing this behavior?
>
> WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code: 137)! See log for details!
> WARNING: The postinstalls for the following packages will be postponed for first boot: liberation-fonts
> ERROR: The following packages could not be configured offline and rootfs is read-only: ['liberation-fonts']
> ERROR: Function failed: do_rootfs
>
> bitbake 32618 98.8 67.1 11031512 10983420 pts/3 R+ 03:00 4:53
> qemu-i386 -r 2.6.32 -L /OE/rootfs -E uD_LIBRARY_PATH=/OE/rootfs//usr/lib:/OE/rootfs//lib /OE/rootfs/usr/bin/fc-cache --sysroot=/OE/rootfs
There are a couple of bugs in the bugzilla around this. One seemed to be
related to circular symlinks in udev's ptest package which was
supposedly fixed. The other claims to have been resolved by upgrading
fontconfig to a version which doesn't have issues with circular paths.
There is general confusion about how to reproduce the issue and what the
real problem is though.
Does your system have any recursive directory structures?
I'd like to get to the bottom of the issue and fix it once and for all
but we likely need more info.
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-21 9:29 ` Richard Purdie
@ 2015-03-21 14:55 ` Martin Jansa
2015-03-23 22:21 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-21 14:55 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-commits, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3121 bytes --]
On Sat, Mar 21, 2015 at 09:29:07AM +0000, Richard Purdie wrote:
> On Sat, 2015-03-21 at 03:11 +0100, Martin Jansa wrote:
> > On Mon, Mar 16, 2015 at 05:42:36PM +0000, git@git.openembedded.org wrote:
> > > Module: openembedded-core.git
> > > Branch: master
> > > Commit: f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> > > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> > >
> > > Author: Jonathan Liu <net147@gmail.com>
> > > Date: Mon Mar 9 12:13:56 2015 +1100
> > >
> > > fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
> > >
> > > Appending to PACKAGEFUNCS results in the font packages missing the
> > > postinst/postrm scripts and the fontconfig cache not being generated
> > > in /var/cache/fontconfig when creating images or installing font
> > > packages. This is because the package data has already been emitted
> > > by emit_pkgdata in PACKAGEFUNCS. Prepend to PACKAGEFUNCS to ensure
> > > add_fontcache_postinsts is executed before emit_pkgdata.
> >
> > It's not caused by this change, but fixing this issue revealed that
> > fc-cache doesn't really work here.
> >
> > Every time the intercept_scripts/update_font_cache executes qemu it gets
> > "stuck" eating a lot of cpu and memory until it dies. Is anyone alse
> > seeing this behavior?
> >
> > WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code: 137)! See log for details!
> > WARNING: The postinstalls for the following packages will be postponed for first boot: liberation-fonts
> > ERROR: The following packages could not be configured offline and rootfs is read-only: ['liberation-fonts']
> > ERROR: Function failed: do_rootfs
> >
> > bitbake 32618 98.8 67.1 11031512 10983420 pts/3 R+ 03:00 4:53
> > qemu-i386 -r 2.6.32 -L /OE/rootfs -E uD_LIBRARY_PATH=/OE/rootfs//usr/lib:/OE/rootfs//lib /OE/rootfs/usr/bin/fc-cache --sysroot=/OE/rootfs
>
> There are a couple of bugs in the bugzilla around this. One seemed to be
> related to circular symlinks in udev's ptest package which was
> supposedly fixed. The other claims to have been resolved by upgrading
> fontconfig to a version which doesn't have issues with circular paths.
>
> There is general confusion about how to reproduce the issue and what the
> real problem is though.
>
> Does your system have any recursive directory structures?
I've tried to build a bit smaller image after sending the report and in
that do_rootfs it finished successfully. I'll try to re-execute this to
see if I get consistent results.
The bigger image has only few more packages in it, so if this is the
case and smaller always works while bigger always fails I should be able
to quickly find out which package/file is causing this.
I'll check the circular symlinks, I know there are some ptest packages
in the bigger one.
Thanks
> I'd like to get to the bottom of the issue and fix it once and for all
> but we likely need more info.
>
> Cheers,
>
> Richard
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-21 14:55 ` Martin Jansa
@ 2015-03-23 22:21 ` Martin Jansa
2015-03-25 12:11 ` Burton, Ross
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-23 22:21 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-commits, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 5477 bytes --]
On Sat, Mar 21, 2015 at 03:55:04PM +0100, Martin Jansa wrote:
> On Sat, Mar 21, 2015 at 09:29:07AM +0000, Richard Purdie wrote:
> > On Sat, 2015-03-21 at 03:11 +0100, Martin Jansa wrote:
> > > On Mon, Mar 16, 2015 at 05:42:36PM +0000, git@git.openembedded.org wrote:
> > > > Module: openembedded-core.git
> > > > Branch: master
> > > > Commit: f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> > > > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f0e3db4eaacc32423934ce09b91bc619dc5dbd21
> > > >
> > > > Author: Jonathan Liu <net147@gmail.com>
> > > > Date: Mon Mar 9 12:13:56 2015 +1100
> > > >
> > > > fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
> > > >
> > > > Appending to PACKAGEFUNCS results in the font packages missing the
> > > > postinst/postrm scripts and the fontconfig cache not being generated
> > > > in /var/cache/fontconfig when creating images or installing font
> > > > packages. This is because the package data has already been emitted
> > > > by emit_pkgdata in PACKAGEFUNCS. Prepend to PACKAGEFUNCS to ensure
> > > > add_fontcache_postinsts is executed before emit_pkgdata.
> > >
> > > It's not caused by this change, but fixing this issue revealed that
> > > fc-cache doesn't really work here.
> > >
> > > Every time the intercept_scripts/update_font_cache executes qemu it gets
> > > "stuck" eating a lot of cpu and memory until it dies. Is anyone alse
> > > seeing this behavior?
> > >
> > > WARNING: The postinstall intercept hook 'update_font_cache' failed (exit code: 137)! See log for details!
> > > WARNING: The postinstalls for the following packages will be postponed for first boot: liberation-fonts
> > > ERROR: The following packages could not be configured offline and rootfs is read-only: ['liberation-fonts']
> > > ERROR: Function failed: do_rootfs
> > >
> > > bitbake 32618 98.8 67.1 11031512 10983420 pts/3 R+ 03:00 4:53
> > > qemu-i386 -r 2.6.32 -L /OE/rootfs -E uD_LIBRARY_PATH=/OE/rootfs//usr/lib:/OE/rootfs//lib /OE/rootfs/usr/bin/fc-cache --sysroot=/OE/rootfs
> >
> > There are a couple of bugs in the bugzilla around this. One seemed to be
> > related to circular symlinks in udev's ptest package which was
> > supposedly fixed. The other claims to have been resolved by upgrading
> > fontconfig to a version which doesn't have issues with circular paths.
> >
> > There is general confusion about how to reproduce the issue and what the
> > real problem is though.
> >
> > Does your system have any recursive directory structures?
>
> I've tried to build a bit smaller image after sending the report and in
> that do_rootfs it finished successfully. I'll try to re-execute this to
> see if I get consistent results.
>
> The bigger image has only few more packages in it, so if this is the
> case and smaller always works while bigger always fails I should be able
> to quickly find out which package/file is causing this.
>
> I'll check the circular symlinks, I know there are some ptest packages
> in the bigger one.
In my case it's reproducible by adding udev-ptest to image, more specifically
having these 2 directories in rootfs:
usr/lib/udev/ptest/test/sys/devices
usr/lib/udev/ptest/test/sys/bus
deleting them and re-triggering the qemu works.
I can also confirm that it's not just lack of memory on the build machine.
It triggers OOM killer after using 64GB as well as on machine with just 8GB.
fc-bug/rootfs-broken$ time ../../../../sysroots/x86_64-linux/usr/bin/qemu-i386 -r 2.6.32 -L . -E LD_LIBRARY_PATH=usr/lib:lib usr/bin/fc-cache --sysroot=.
... OOM killer in an hour or 2 ... (this time I didn't get a log, because it killed almost everything else except qemu-i386 :)
fc-bug/rootfs-broken$ cd ..
fc-bug$ cp -ra rootfs-broken rootfs-broken-without-udev-ptest-bus-devices
fc-bug$ cd rootfs-broken-without-udev-ptest-bus-devices
fc-bug/rootfs-broken-without-udev-ptest-bus-devices$ rm -rf usr/lib/udev/ptest/test/sys/devices/ usr/lib/udev/ptest/test/sys/bus/
fc-bug/rootfs-broken-without-udev-ptest-bus-devices$ time ../../../../sysroots/x86_64-linux/usr/bin/qemu-i386 -r 2.6.32 -L . -E LD_LIBRARY_PATH=usr/lib:lib usr/bin/fc-cache --sysroot=.
real 0m30.424s
user 0m29.714s
sys 0m0.548s
Comparing strace shows the broken one to cycle a lot in directories like this:
< getdents(51, /* 8 entries */, 32768) = 248
< openat(AT_FDCWD, "//home/jenkins/anaconda/build-starfish-dizzy/build/BUILD/work/qemux86-starfish-linux/fc-bug/rootfs-broken/./usr/lib/udev/ptest/test/sys/dev/block/8:1/subsystem/loop2/bdi/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/0:16/subsystem/8:16/subsystem/8:0/power", O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC) = 52
This issue forced me to finally set ulimit in my builds so that I can kill the
right process a bit sooner (instead of waiting for it to eat e.g. 128GB)
I'll try to create smaller reproducer and check newer fontconfig.
>
> Thanks
>
> > I'd like to get to the bottom of the issue and fix it once and for all
> > but we likely need more info.
> >
> > Cheers,
> >
> > Richard
> >
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-23 22:21 ` Martin Jansa
@ 2015-03-25 12:11 ` Burton, Ross
2015-03-25 16:12 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Burton, Ross @ 2015-03-25 12:11 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core, openembedded-commits@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
On 23 March 2015 at 22:21, Martin Jansa <martin.jansa@gmail.com> wrote:
> In my case it's reproducible by adding udev-ptest to image, more
> specifically
> having these 2 directories in rootfs:
> usr/lib/udev/ptest/test/sys/devices
> usr/lib/udev/ptest/test/sys/bus
>
oe-core 3f799b should mean that those directories are in a tarball instead
of unpacked on the rootfs. Do you have that commit?
Ross
[-- Attachment #2: Type: text/html, Size: 869 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-25 12:11 ` Burton, Ross
@ 2015-03-25 16:12 ` Martin Jansa
2015-03-25 16:18 ` Burton, Ross
2015-03-29 0:28 ` Martin Jansa
0 siblings, 2 replies; 24+ messages in thread
From: Martin Jansa @ 2015-03-25 16:12 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, openembedded-commits@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
On Wed, Mar 25, 2015 at 12:11:05PM +0000, Burton, Ross wrote:
> On 23 March 2015 at 22:21, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> > In my case it's reproducible by adding udev-ptest to image, more
> > specifically
> > having these 2 directories in rootfs:
> > usr/lib/udev/ptest/test/sys/devices
> > usr/lib/udev/ptest/test/sys/bus
> >
>
> oe-core 3f799b should mean that those directories are in a tarball instead
> of unpacked on the rootfs. Do you have that commit?
Oh, thanks for pointer. I was seeing the same issue in dizzy and master
build, but this change can explain why I wasn't able to reproduce it in
master yesterday.
> Ross
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-25 16:12 ` Martin Jansa
@ 2015-03-25 16:18 ` Burton, Ross
2015-03-25 22:14 ` Martin Jansa
2015-03-29 0:28 ` Martin Jansa
1 sibling, 1 reply; 24+ messages in thread
From: Burton, Ross @ 2015-03-25 16:18 UTC (permalink / raw)
To: Martin Jansa, Armin Kuster; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
On 25 March 2015 at 16:12, Martin Jansa <martin.jansa@gmail.com> wrote:
> Oh, thanks for pointer. I was seeing the same issue in dizzy and master
> build, but this change can explain why I wasn't able to reproduce it in
> master yesterday.
>
Sounds like we should backport that to dizzy (CCing Armin).
Ross
[-- Attachment #2: Type: text/html, Size: 736 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-25 16:18 ` Burton, Ross
@ 2015-03-25 22:14 ` Martin Jansa
2015-03-26 21:39 ` Burton, Ross
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-25 22:14 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 848 bytes --]
On Wed, Mar 25, 2015 at 04:18:49PM +0000, Burton, Ross wrote:
> On 25 March 2015 at 16:12, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> > Oh, thanks for pointer. I was seeing the same issue in dizzy and master
> > build, but this change can explain why I wasn't able to reproduce it in
> > master yesterday.
> >
>
> Sounds like we should backport that to dizzy (CCing Armin).
yes, I've verified that I can reproduce this issue in master after
reverting this change and that it resolves the issue in dizzy if I
backport it with one other change (just to apply it cleanly with
additional bugfix), I've referenced the fontcache.bbclass fix, these
3 should go in only together.
My bigger image build is still running, but this fix is definitely
helping.
Thanks,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-25 22:14 ` Martin Jansa
@ 2015-03-26 21:39 ` Burton, Ross
0 siblings, 0 replies; 24+ messages in thread
From: Burton, Ross @ 2015-03-26 21:39 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
On 25 March 2015 at 22:14, Martin Jansa <martin.jansa@gmail.com> wrote:
> yes, I've verified that I can reproduce this issue in master after
> reverting this change and that it resolves the issue in dizzy if I
> backport it with one other change (just to apply it cleanly with
> additional bugfix), I've referenced the fontcache.bbclass fix, these
> 3 should go in only together.
>
So I just managed to replicate and root-cause this a bit. Good news:
found this in qemu's bugzilla. Bad news: it's been open since 2013.
https://bugs.launchpad.net/qemu/+bug/1245703
The startup code iterates all files in the "sysroot" and cyclic symlinks
cause it to iterate forever. So for now the official advice is "don't have
cyclic symlinks in your rootfs, or qemu breaks".
Ross
[-- Attachment #2: Type: text/html, Size: 1492 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-25 16:12 ` Martin Jansa
2015-03-25 16:18 ` Burton, Ross
@ 2015-03-29 0:28 ` Martin Jansa
2015-03-29 1:27 ` [PATCH] fontcache: allow to pass different fontconfig cache dir Martin Jansa
2015-03-30 10:09 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Burton, Ross
1 sibling, 2 replies; 24+ messages in thread
From: Martin Jansa @ 2015-03-29 0:28 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, openembedded-commits@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 1789 bytes --]
On Wed, Mar 25, 2015 at 05:12:08PM +0100, Martin Jansa wrote:
> On Wed, Mar 25, 2015 at 12:11:05PM +0000, Burton, Ross wrote:
> > On 23 March 2015 at 22:21, Martin Jansa <martin.jansa@gmail.com> wrote:
> >
> > > In my case it's reproducible by adding udev-ptest to image, more
> > > specifically
> > > having these 2 directories in rootfs:
> > > usr/lib/udev/ptest/test/sys/devices
> > > usr/lib/udev/ptest/test/sys/bus
> > >
> >
> > oe-core 3f799b should mean that those directories are in a tarball instead
> > of unpacked on the rootfs. Do you have that commit?
>
> Oh, thanks for pointer. I was seeing the same issue in dizzy and master
> build, but this change can explain why I wasn't able to reproduce it in
> master yesterday.
I've found the reason why it was failing for me in master even with this
udev fix when building our internal images.
The problem is that we have fontconfig bbappend which sets:
WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
EXTRA_OECONF_append = " --with-cache-dir=${WEBOS_FONTCONFIG_CACHE}"
and this oe-core commit:
commit 23393c6685860d0b1c459874d35395360d0b6d3c
Author: Jonathan Liu <net147@gmail.com>
Date: Mon Mar 9 13:28:37 2015 +1100
postinst-intercepts/update_font_cache: fix ownership of fontconfig cache
adds:
chown -R root:root $D${localstatedir}/cache/fontconfig
Which doesn't exist in our builds and chown and whole postinst
interceptor fails.
I'll send patch to make fontconfig cache dir configureable so that we
don't need to overlay fontcache.bbclass as well as
scripts/postinst-intercepts/update_font_cache
Thanks,
>
> > Ross
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH] fontcache: allow to pass different fontconfig cache dir
2015-03-29 0:28 ` Martin Jansa
@ 2015-03-29 1:27 ` Martin Jansa
2015-03-30 10:47 ` Burton, Ross
2015-03-30 10:09 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Burton, Ross
1 sibling, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-29 1:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/fontcache.bbclass | 4 ++--
scripts/postinst-intercepts/update_font_cache | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index dfbdfa1..d122387 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,11 +8,11 @@ inherit qemu
FONT_PACKAGES ??= "${PN}"
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
-
+FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
fontcache_common() {
if [ "x$D" != "x" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
- libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
+ libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
else
fc-cache
fi
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index 3907f25..c8c6018 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,6 +2,4 @@
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
$D${bindir}/fc-cache --sysroot=$D
-chown -R root:root $D${localstatedir}/cache/fontconfig
-
-
+chown -R root:root $D${fontconfigcachedir}
--
2.3.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-29 0:28 ` Martin Jansa
2015-03-29 1:27 ` [PATCH] fontcache: allow to pass different fontconfig cache dir Martin Jansa
@ 2015-03-30 10:09 ` Burton, Ross
2015-03-30 16:41 ` Khem Raj
1 sibling, 1 reply; 24+ messages in thread
From: Burton, Ross @ 2015-03-30 10:09 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core, openembedded-commits@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
On 29 March 2015 at 00:28, Martin Jansa <martin.jansa@gmail.com> wrote:
> WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
>
I'm sure there's a good reason why fontconfig caches are going in datadir
but I'm not sure I want to know it :)
Ross
[-- Attachment #2: Type: text/html, Size: 690 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] fontcache: allow to pass different fontconfig cache dir
2015-03-29 1:27 ` [PATCH] fontcache: allow to pass different fontconfig cache dir Martin Jansa
@ 2015-03-30 10:47 ` Burton, Ross
2015-03-30 17:27 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Burton, Ross @ 2015-03-30 10:47 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
On 29 March 2015 at 02:27, Martin Jansa <martin.jansa@gmail.com> wrote:
> +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
>
So how is fontconfig told to read fonts from this location?
Ross
[-- Attachment #2: Type: text/html, Size: 632 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 10:09 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Burton, Ross
@ 2015-03-30 16:41 ` Khem Raj
2015-03-30 16:43 ` Burton, Ross
2015-03-30 18:46 ` Martin Jansa
0 siblings, 2 replies; 24+ messages in thread
From: Khem Raj @ 2015-03-30 16:41 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-commits@lists.openembedded.org, OE-core
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
> On Mar 30, 2015, at 3:09 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
>
> On 29 March 2015 at 00:28, Martin Jansa <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote:
> WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
>
> I'm sure there's a good reason why fontconfig caches are going in datadir but I'm not sure I want to know it :)
>
aren’t they variable data files ? where else should it go otherwise
> Ross
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Type: text/html, Size: 1780 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 16:41 ` Khem Raj
@ 2015-03-30 16:43 ` Burton, Ross
2015-03-30 16:47 ` Khem Raj
2015-03-30 18:46 ` Martin Jansa
1 sibling, 1 reply; 24+ messages in thread
From: Burton, Ross @ 2015-03-30 16:43 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-commits@lists.openembedded.org, OE-core
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
On 30 March 2015 at 17:41, Khem Raj <raj.khem@gmail.com> wrote:
> aren’t they variable data files ? where else should it go otherwise
>
They're directory-wide caches, and caches tend to go into /var/cache.
Ross
[-- Attachment #2: Type: text/html, Size: 558 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 16:43 ` Burton, Ross
@ 2015-03-30 16:47 ` Khem Raj
0 siblings, 0 replies; 24+ messages in thread
From: Khem Raj @ 2015-03-30 16:47 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-commits@lists.openembedded.org, OE-core
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
> On Mar 30, 2015, at 9:43 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
>
> On 30 March 2015 at 17:41, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> aren’t they variable data files ? where else should it go otherwise
>
> They're directory-wide caches, and caches tend to go into /var/cache.
>
yes /var/cache is what I was expecting too
> Ross
[-- Attachment #2: Type: text/html, Size: 1430 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH] fontcache: allow to pass different fontconfig cache dir
2015-03-30 10:47 ` Burton, Ross
@ 2015-03-30 17:27 ` Martin Jansa
2015-04-07 11:21 ` [PATCHv2] " Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-30 17:27 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
On Mon, Mar 30, 2015 at 11:47:39AM +0100, Burton, Ross wrote:
> On 29 March 2015 at 02:27, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> >
>
> So how is fontconfig told to read fonts from this location?
I think it's the same
--with-cache-dir
parameter which says where to generate the cache and then read it in
runtime.
I didn't change it in fontconfig recipe, because the default is already
matching with FONTCONFIG_CACHE_DIR, do you want me to pass
--with-cache-dir parameter? I agree that it could be less surprising for
people who want to change it, but on the other hand if upstream moves
default cache location in some newer fontconfig version, then the person
updating the recipe should check FONTCONFIG_CACHE_DIR value as well.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 16:41 ` Khem Raj
2015-03-30 16:43 ` Burton, Ross
@ 2015-03-30 18:46 ` Martin Jansa
2015-03-30 18:49 ` Khem Raj
1 sibling, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-03-30 18:46 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-commits@lists.openembedded.org, OE-core
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
On Mon, Mar 30, 2015 at 09:41:30AM -0700, Khem Raj wrote:
>
> > On Mar 30, 2015, at 3:09 AM, Burton, Ross <ross.burton@intel.com> wrote:
> >
> >
> > On 29 March 2015 at 00:28, Martin Jansa <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote:
> > WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
> >
> > I'm sure there's a good reason why fontconfig caches are going in datadir but I'm not sure I want to know it :)
> >
>
> aren’t they variable data files ? where else should it go otherwise
I've replied to Ross off-list because I'm not sure how much details I
should share, but basically we have read-only rootfs which has all the
font packages installed, so cache from do_rootfs should remain valid
forever. And we delete everything in /var during reset to factory
settings (that's why we had to move everything which we want to persist
during factory resets like this cache).
We also have additional fontconfig patch which ignores timestamp
modifications in font directories, so that the cache is considered valid
even after some manual modification in rootfs (e.g. in devel images
which can be switched to read-write mode).
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 18:46 ` Martin Jansa
@ 2015-03-30 18:49 ` Khem Raj
2015-03-30 20:07 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Khem Raj @ 2015-03-30 18:49 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-commits@lists.openembedded.org, OE-core
> On Mar 30, 2015, at 11:46 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Mon, Mar 30, 2015 at 09:41:30AM -0700, Khem Raj wrote:
>>
>>> On Mar 30, 2015, at 3:09 AM, Burton, Ross <ross.burton@intel.com> wrote:
>>>
>>>
>>> On 29 March 2015 at 00:28, Martin Jansa <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote:
>>> WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
>>>
>>> I'm sure there's a good reason why fontconfig caches are going in datadir but I'm not sure I want to know it :)
>>>
>>
>> aren’t they variable data files ? where else should it go otherwise
>
> I've replied to Ross off-list because I'm not sure how much details I
> should share, but basically we have read-only rootfs which has all the
> font packages installed, so cache from do_rootfs should remain valid
> forever. And we delete everything in /var during reset to factory
> settings (that's why we had to move everything which we want to persist
> during factory resets like this cache).
>
> We also have additional fontconfig patch which ignores timestamp
> modifications in font directories, so that the cache is considered valid
> even after some manual modification in rootfs (e.g. in devel images
> which can be switched to read-write mode).
may be copy-binds could be deployed ?
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
2015-03-30 18:49 ` Khem Raj
@ 2015-03-30 20:07 ` Martin Jansa
0 siblings, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2015-03-30 20:07 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-commits@lists.openembedded.org, OE-core
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
On Mon, Mar 30, 2015 at 11:49:21AM -0700, Khem Raj wrote:
>
> > On Mar 30, 2015, at 11:46 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >
> > On Mon, Mar 30, 2015 at 09:41:30AM -0700, Khem Raj wrote:
> >>
> >>> On Mar 30, 2015, at 3:09 AM, Burton, Ross <ross.burton@intel.com> wrote:
> >>>
> >>>
> >>> On 29 March 2015 at 00:28, Martin Jansa <martin.jansa@gmail.com <mailto:martin.jansa@gmail.com>> wrote:
> >>> WEBOS_FONTCONFIG_CACHE = "${datadir}/fontconfig/cache"
> >>>
> >>> I'm sure there's a good reason why fontconfig caches are going in datadir but I'm not sure I want to know it :)
> >>>
> >>
> >> aren’t they variable data files ? where else should it go otherwise
> >
> > I've replied to Ross off-list because I'm not sure how much details I
> > should share, but basically we have read-only rootfs which has all the
> > font packages installed, so cache from do_rootfs should remain valid
> > forever. And we delete everything in /var during reset to factory
> > settings (that's why we had to move everything which we want to persist
> > during factory resets like this cache).
> >
> > We also have additional fontconfig patch which ignores timestamp
> > modifications in font directories, so that the cache is considered valid
> > even after some manual modification in rootfs (e.g. in devel images
> > which can be switched to read-write mode).
>
> may be copy-binds could be deployed ?
We have that but IIRC copy-binds are mounted after or at the same time
the UI is starting in our upstart scripts (to show UI as soon as possible)
and we don't want to wait for copy-binds to be finished before loading fontconfig cache.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCHv2] fontcache: allow to pass different fontconfig cache dir
2015-03-30 17:27 ` Martin Jansa
@ 2015-04-07 11:21 ` Martin Jansa
2015-04-09 10:12 ` Richard Purdie
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-04-07 11:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
what Ross wanted
meta/classes/fontcache.bbclass | 4 ++--
meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
scripts/postinst-intercepts/update_font_cache | 4 +---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index dfbdfa1..d122387 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,11 +8,11 @@ inherit qemu
FONT_PACKAGES ??= "${PN}"
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
-
+FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
fontcache_common() {
if [ "x$D" != "x" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
- libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
+ libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
else
fc-cache
fi
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
index 797b321..7c5b4b4 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
@@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
inherit autotools pkgconfig
-EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
+FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
+
+EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
BBCLASSEXTEND = "native"
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index 3907f25..c8c6018 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,6 +2,4 @@
PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
$D${bindir}/fc-cache --sysroot=$D
-chown -R root:root $D${localstatedir}/cache/fontconfig
-
-
+chown -R root:root $D${fontconfigcachedir}
--
2.3.5
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCHv2] fontcache: allow to pass different fontconfig cache dir
2015-04-07 11:21 ` [PATCHv2] " Martin Jansa
@ 2015-04-09 10:12 ` Richard Purdie
2015-04-09 11:35 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Richard Purdie @ 2015-04-09 10:12 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Tue, 2015-04-07 at 13:21 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
> what Ross wanted
>
> meta/classes/fontcache.bbclass | 4 ++--
> meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
> scripts/postinst-intercepts/update_font_cache | 4 +---
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> index dfbdfa1..d122387 100644
> --- a/meta/classes/fontcache.bbclass
> +++ b/meta/classes/fontcache.bbclass
> @@ -8,11 +8,11 @@ inherit qemu
>
> FONT_PACKAGES ??= "${PN}"
> FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
> -
> +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> fontcache_common() {
> if [ "x$D" != "x" ] ; then
> $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
> - libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
> + libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
> else
> fc-cache
> fi
> diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> index 797b321..7c5b4b4 100644
> --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
>
> inherit autotools pkgconfig
>
> -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
> +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> +
> +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
>
> BBCLASSEXTEND = "native"
> diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
> index 3907f25..c8c6018 100644
> --- a/scripts/postinst-intercepts/update_font_cache
> +++ b/scripts/postinst-intercepts/update_font_cache
> @@ -2,6 +2,4 @@
>
> PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> $D${bindir}/fc-cache --sysroot=$D
> -chown -R root:root $D${localstatedir}/cache/fontconfig
> -
> -
> +chown -R root:root $D${fontconfigcachedir}
This looks better but what sets fontconfigcachedir ?
Cheers,
Richard
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCHv2] fontcache: allow to pass different fontconfig cache dir
2015-04-09 10:12 ` Richard Purdie
@ 2015-04-09 11:35 ` Martin Jansa
2015-04-20 10:16 ` Martin Jansa
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2015-04-09 11:35 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3106 bytes --]
On Thu, Apr 09, 2015 at 11:12:30AM +0100, Richard Purdie wrote:
> On Tue, 2015-04-07 at 13:21 +0200, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
> > what Ross wanted
> >
> > meta/classes/fontcache.bbclass | 4 ++--
> > meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
> > scripts/postinst-intercepts/update_font_cache | 4 +---
> > 3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> > index dfbdfa1..d122387 100644
> > --- a/meta/classes/fontcache.bbclass
> > +++ b/meta/classes/fontcache.bbclass
> > @@ -8,11 +8,11 @@ inherit qemu
> >
> > FONT_PACKAGES ??= "${PN}"
> > FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
> > -
> > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
]> > fontcache_common() {
> > if [ "x$D" != "x" ] ; then
> > $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
> > - libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
> > + libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
> > else
> > fc-cache
> > fi
> > diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > index 797b321..7c5b4b4 100644
> > --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
> >
> > inherit autotools pkgconfig
> >
> > -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
> > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> > +
> > +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
> >
> > BBCLASSEXTEND = "native"
> > diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
> > index 3907f25..c8c6018 100644
> > --- a/scripts/postinst-intercepts/update_font_cache
> > +++ b/scripts/postinst-intercepts/update_font_cache
> > @@ -2,6 +2,4 @@
> >
> > PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> > $D${bindir}/fc-cache --sysroot=$D
> > -chown -R root:root $D${localstatedir}/cache/fontconfig
> > -
> > -
> > +chown -R root:root $D${fontconfigcachedir}
>
> This looks better but what sets fontconfigcachedir ?
It's passed in intercept call in fontcache.bbclass like other variables
used here.
People who want to change the value should do so from global scope, so
that the same value is used in fontconfig_2.11.1.bb and
fontcache.bbclass.
Once this is merged in master, I would like to see it in dizzy (and
fido) branches together with other fontconfig related fixes.
Thanks
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCHv2] fontcache: allow to pass different fontconfig cache dir
2015-04-09 11:35 ` Martin Jansa
@ 2015-04-20 10:16 ` Martin Jansa
0 siblings, 0 replies; 24+ messages in thread
From: Martin Jansa @ 2015-04-20 10:16 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Thu, Apr 09, 2015 at 01:35:39PM +0200, Martin Jansa wrote:
> On Thu, Apr 09, 2015 at 11:12:30AM +0100, Richard Purdie wrote:
> > On Tue, 2015-04-07 at 13:21 +0200, Martin Jansa wrote:
> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > > ---
> > > v2: added --with-cache-dir to fontconfig EXTRA_OECONF in case that was
> > > what Ross wanted
> > >
> > > meta/classes/fontcache.bbclass | 4 ++--
> > > meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb | 4 +++-
> > > scripts/postinst-intercepts/update_font_cache | 4 +---
> > > 3 files changed, 6 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
> > > index dfbdfa1..d122387 100644
> > > --- a/meta/classes/fontcache.bbclass
> > > +++ b/meta/classes/fontcache.bbclass
> > > @@ -8,11 +8,11 @@ inherit qemu
> > >
> > > FONT_PACKAGES ??= "${PN}"
> > > FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
> > > -
> > > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> ]> > fontcache_common() {
> > > if [ "x$D" != "x" ] ; then
> > > $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} bindir=${bindir} \
> > > - libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
> > > + libdir=${libdir} base_libdir=${base_libdir} fontconfigcachedir=${FONTCONFIG_CACHE_DIR}
> > > else
> > > fc-cache
> > > fi
> > > diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > > index 797b321..7c5b4b4 100644
> > > --- a/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > > +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb
> > > @@ -37,6 +37,8 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
> > >
> > > inherit autotools pkgconfig
> > >
> > > -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts"
> > > +FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
> > > +
> > > +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}"
> > >
> > > BBCLASSEXTEND = "native"
> > > diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
> > > index 3907f25..c8c6018 100644
> > > --- a/scripts/postinst-intercepts/update_font_cache
> > > +++ b/scripts/postinst-intercepts/update_font_cache
> > > @@ -2,6 +2,4 @@
> > >
> > > PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> > > $D${bindir}/fc-cache --sysroot=$D
> > > -chown -R root:root $D${localstatedir}/cache/fontconfig
> > > -
> > > -
> > > +chown -R root:root $D${fontconfigcachedir}
> >
> > This looks better but what sets fontconfigcachedir ?
>
> It's passed in intercept call in fontcache.bbclass like other variables
> used here.
>
> People who want to change the value should do so from global scope, so
> that the same value is used in fontconfig_2.11.1.bb and
> fontcache.bbclass.
>
> Once this is merged in master, I would like to see it in dizzy (and
> fido) branches together with other fontconfig related fixes.
The other fontconfig related fix:
fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending
was merged to dizzy recently, so now dizzy is broken for us, because
this one (and the one fixing permissions) are missing :/.
Do you expect more changes for this patch or was my explanation enough
to get it accepted?
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2015-04-20 10:16 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20150316174236.48B8050234@opal.openembedded.org>
2015-03-21 2:11 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Martin Jansa
2015-03-21 9:29 ` Richard Purdie
2015-03-21 14:55 ` Martin Jansa
2015-03-23 22:21 ` Martin Jansa
2015-03-25 12:11 ` Burton, Ross
2015-03-25 16:12 ` Martin Jansa
2015-03-25 16:18 ` Burton, Ross
2015-03-25 22:14 ` Martin Jansa
2015-03-26 21:39 ` Burton, Ross
2015-03-29 0:28 ` Martin Jansa
2015-03-29 1:27 ` [PATCH] fontcache: allow to pass different fontconfig cache dir Martin Jansa
2015-03-30 10:47 ` Burton, Ross
2015-03-30 17:27 ` Martin Jansa
2015-04-07 11:21 ` [PATCHv2] " Martin Jansa
2015-04-09 10:12 ` Richard Purdie
2015-04-09 11:35 ` Martin Jansa
2015-04-20 10:16 ` Martin Jansa
2015-03-30 10:09 ` [oe-commits] Jonathan Liu : fontcache.bbclass: prepend to PACKAGEFUNCS instead of appending Burton, Ross
2015-03-30 16:41 ` Khem Raj
2015-03-30 16:43 ` Burton, Ross
2015-03-30 16:47 ` Khem Raj
2015-03-30 18:46 ` Martin Jansa
2015-03-30 18:49 ` Khem Raj
2015-03-30 20:07 ` Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox