On Wed, May 18, 2016 at 08:33:37PM +0800, Herve Jourdain wrote:
> When compiling mesa, if dri is disabled in PACKAGECONFIG, or if the list of
> DRI drivers is empty, it will cause populate_package to fail, because it
> can't find - rightfully - the directory for the DRI drivers.
> This patch checks that the directory indeed exists before trying to get a
> list of the files in it
>
> Signed-off-by: Herve Jourdain <herve.jourd...@neuf.fr>
> ---
> meta/recipes-graphics/mesa/mesa.inc | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> index a4e5351..0e46092 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -143,15 +143,16 @@ python mesa_populate_packages() {
>
> import re
> dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
> - dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
> - lib_name = d.expand("${MLPREFIX}mesa-megadriver")
> - for p in dri_pkgs:
> - m = re.match('^(.*)_dri\.so$', p)
> - if m:
> - pkg_name = " ${MLPREFIX}mesa-driver-%s" %
> legitimize_package_name(m.group(1))
> - d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
> - d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
> - d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
> + if os.path.isdir(d.getVar('PKGD', True) + dri_drivers_root):
Use os.path.join instead of +
> + dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root)
> + lib_name = d.expand("${MLPREFIX}mesa-megadriver")
> + for p in dri_pkgs:
> + m = re.match('^(.*)_dri\.so$', p)
> + if m:
> + pkg_name = " ${MLPREFIX}mesa-driver-%s" %
> legitimize_package_name(m.group(1))
> + d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
> + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name)
> + d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
>
> pipe_drivers_root = os.path.join(d.getVar('libdir', True),
> "gallium-pipe")
> do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$',
> 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
