Skip to contentSkip to conversation

pulseaudio: use stricter PACKAGES_DYNAMIC

PATCH In review Martin Jansa 2 participants 5 messages Apr 21, 2015 – Apr 27, 2015

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/3 pulseaudio: use stricter PACKAGES_DYNAMIC

* I don't see any usage for libpulse-* packages
* adding '-' resolves the issue when we have separate recipe for pulseaudio-modules-droid which isn't built to satisfy RDEPENDS with the same name, because generic pulseaudio recipe seems to RPROVIDE it through PACKAGES_DYNAMIC

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index db144a9..99cad76 100644
@@ -79,7 +79,7 @@ PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainl
 #upgrade path:
 RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
 
-PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* "
+PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*"
 
 FILES_libpulsecore = "${libdir}/libpulsecore*.so"
 FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so"
Signature · 1 line
2.3.5
author
#1 lore raw

PATCH 2/3 postinst-intercepts/update_font_cache: fix ownership of fontconfig cache

From: Jonathan Liu <[email protected]>

The file ownership of the cache files in /var/cache/fontconfig needs to be set to root:root otherwise it inherits the user and group id of the build user.

[YOCTO #7411]

Signed-off-by Jonathan Liu <[email protected]>
Signed-off-by Ross Burton <[email protected]>
---
 meta/classes/fontcache.bbclass                | 2 +-
 scripts/postinst-intercepts/update_font_cache | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/classes/fontcache.bbclass +1 -1
index dcd1f04..dfbdfa1 100644
@@ -12,7 +12,7 @@ FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
 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}
+		libdir=${libdir} base_libdir=${base_libdir} localstatedir=${localstatedir}
 else
 	fc-cache
 fi
scripts/postinst-intercepts/update_font_cache +1 -0
index 78f3365..3907f25 100644
@@ -2,5 +2,6 @@
 
 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
Signature · 1 line
2.3.5
author
#2 lore raw

PATCH 3/3 fontcache: allow to pass different fontconfig cache dir

In reply to Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 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(-)
meta/classes/fontcache.bbclass +2 -2
index dfbdfa1..d122387 100644
@@ -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
meta/recipes-graphics/fontconfig/fontconfig_2.11.1.bb +3 -1
index 797b321..7c5b4b4 100644
@@ -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"
scripts/postinst-intercepts/update_font_cache +1 -3
index 3907f25..c8c6018 100644
@@ -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}
Signature · 1 line
2.3.5
author
#3 lore raw
In reply to Martin Jansa
Quoted 5 lines · Martin Jansa

* I don't see any usage for libpulse-* packages
* adding '-' resolves the issue when we have separate recipe for pulseaudio-modules-droid which isn't built to satisfy RDEPENDS with the same name, because generic pulseaudio recipe seems to RPROVIDE it through PACKAGES_DYNAMIC

ping for all 3 changes

Quoted 22 lines
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index db144a9..99cad76 100644
@@ -79,7 +79,7 @@ PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainl
 #upgrade path:
 RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
 
-PACKAGES_DYNAMIC += "^pulseaudio-lib.* ^pulseaudio-module.* ^libpulse-lib.* ^libpulse-module.* "
+PACKAGES_DYNAMIC += "^pulseaudio-lib-.* ^pulseaudio-module-.*"
 
 FILES_libpulsecore = "${libdir}/libpulsecore*.so"
 FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so"
Signature · 1 line
2.3.5
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw
Quoted 8 lines · Martin Jansa
Quoted 5 lines · Martin Jansa

* I don't see any usage for libpulse-* packages
* adding '-' resolves the issue when we have separate recipe for pulseaudio-modules-droid which isn't built to satisfy RDEPENDS with the same name, because generic pulseaudio recipe seems to RPROVIDE it through PACKAGES_DYNAMIC

ping for all 3 changes

Ack for all 3 changes.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750