Patchwork [06/13] mesa: remove usage of FILESPATH

login
register
mail settings
Submitter Petter Mabäcker
Date May 7, 2014, 9:19 p.m.
Message ID <ef46a93d3cc0aba1ae86b5c78c29374b0e9eacd5.1399497346.git.petter@technux.se>
Download mbox | patch
Permalink /patch/71735/
State New
Headers show

Comments

Petter Mabäcker - May 7, 2014, 9:19 p.m.
Fixes [YOCTO #4497]

Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Avoid using files dir in mesa, since current patchdirs are only shared
between some of the bb-files. Also remove unused filespath addition.

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - May 8, 2014, 10:49 a.m.
On Wed, May 07, 2014 at 11:19:52PM +0200, Petter Mabäcker wrote:
> Fixes [YOCTO #4497]
> 
> Usage of FILESPATH is discouraged, since it can make recipes harder to
> bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
> Avoid using files dir in mesa, since current patchdirs are only shared
> between some of the bb-files. Also remove unused filespath addition.
> 
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
>  meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
> index 8c7d8e8..9059207 100644
> --- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
> +++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
> @@ -2,7 +2,7 @@ require mesa_${PV}.bb
>  
>  SUMMARY += " (OpenGL only, no EGL/GLES)"
>  
> -FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAME}/mesa"], d)}"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/mesa:"

This was prefering files from mesa-${PV} (when there was version
specific file available) now it doesn't, is it correct?

>  
>  PROVIDES = "virtual/libgl virtual/mesa"
>  
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Petter Mabäcker - May 9, 2014, 5:11 a.m.
2014-05-08 12:49 skrev Martin Jansa:

> On Wed, May 07, 2014 at 11:19:52PM +0200, Petter Mabäcker wrote:
>
>> Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can
>> make recipes harder to bbappend. Instead FILESEXTRAPATHS should be 
>> used
>> to extend the path. Avoid using files dir in mesa, since current
>> patchdirs are only shared between some of the bb-files. Also remove
>> unused filespath addition. Signed-off-by: Petter Mabäcker
>> <petter@technux.se> --- meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb 
>> | 2
>> +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
>> a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
>> b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb index 8c7d8e8..9059207
>> 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +++
>> b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb @@ -2,7 +2,7 @@ 
>> require
>> mesa_${PV}.bb SUMMARY += " (OpenGL only, no EGL/GLES)" -FILESPATH =
>> "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}",
>> "${FILE_DIRNAME}/mesa"], d)}" +FILESEXTRAPATHS_prepend :=
>> "${THISDIR}/mesa:"
>
> This was prefering files from mesa-${PV} (when there was version
> specific file available) now it doesn't, is it correct?

Yes, at least I think this is correct, since no patch/files exists in 
mesa-${PV} dir for the moment. If someone in the future would like to 
add files that is version unique, then they will not apply for mesa-gl 
since it's not in it's path (after this change). So you then just have 
to make a new decision if the file should be added before or after 
"mesa/". But I cannot of course add it back, if you or someone else know 
about any pitfall I should watch out for?

>
>> PROVIDES = "virtual/libgl virtual/mesa" -- 1.7.9.5 --
>> _______________________________________________ Openembedded-core
>> mailing list Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]


Links:
------
[1] http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
index 8c7d8e8..9059207 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
@@ -2,7 +2,7 @@  require mesa_${PV}.bb
 
 SUMMARY += " (OpenGL only, no EGL/GLES)"
 
-FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAME}/mesa"], d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/mesa:"
 
 PROVIDES = "virtual/libgl virtual/mesa"