[10/13] python: remove usage of FILESPATH

Submitted by Petter Mabäcker on May 7, 2014, 9:19 p.m.

Details

Message ID f81a9671ffe21ca44d9a06d78a61550e94ba170c.1399497346.git.petter@technux.se
State Superseded
Headers show

Commit Message

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. Don't migrate paths that already exist in base FILESPATH to
FILESEXTRAPATHS (e.g. BPN, BP and files).

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 .../recipes-devtools/python/python-native_2.7.3.bb |    2 +-
 .../python/python-pygobject_2.28.3.bb              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0c66d27..4949546 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -21,7 +21,7 @@  SRC_URI += "\
            "
 S = "${WORKDIR}/Python-${PV}"
 
-FILESPATH = "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 inherit native
 
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 9dbe47c..691666c 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -16,7 +16,7 @@  SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
 SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
 S = "${WORKDIR}/pygobject-${PV}"
 
-FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 EXTRA_OECONF += "--disable-introspection"
 
 PARALLEL_MAKEINST = ""

Comments

Martin Jansa May 8, 2014, 10:53 a.m.
On Wed, May 07, 2014 at 11:19:56PM +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. Don't migrate paths that already exist in base FILESPATH to
> FILESEXTRAPATHS (e.g. BPN, BP and files).
> 
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
>  .../recipes-devtools/python/python-native_2.7.3.bb |    2 +-
>  .../python/python-pygobject_2.28.3.bb              |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
> index 0c66d27..4949546 100644
> --- a/meta/recipes-devtools/python/python-native_2.7.3.bb
> +++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
> @@ -21,7 +21,7 @@ SRC_URI += "\
>             "
>  S = "${WORKDIR}/Python-${PV}"
>  
> -FILESPATH = "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
>  inherit native
>  
> diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> index 9dbe47c..691666c 100644
> --- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> +++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> @@ -16,7 +16,7 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
>  SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
>  S = "${WORKDIR}/pygobject-${PV}"
>  
> -FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

Is this one correct?

There is
BBCLASSEXTEND = "native"

and prepending python-pygobject-native doesn't seem to be needed.

>  EXTRA_OECONF += "--disable-introspection"
>  
>  PARALLEL_MAKEINST = ""
> -- 
> 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, 4:53 a.m.
2014-05-08 12:53 skrev Martin Jansa:

> On Wed, May 07, 2014 at 11:19:56PM +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. Don't migrate paths that already exist in base
>> FILESPATH to FILESEXTRAPATHS (e.g. BPN, BP and files). 
>> Signed-off-by:
>> Petter Mabäcker <petter@technux.se> ---
>> .../recipes-devtools/python/python-native_2.7.3.bb | 2 +-
>> .../python/python-pygobject_2.28.3.bb | 2 +- 2 files changed, 2
>> insertions(+), 2 deletions(-) diff --git
>> a/meta/recipes-devtools/python/python-native_2.7.3.bb
>> b/meta/recipes-devtools/python/python-native_2.7.3.bb index
>> 0c66d27..4949546 100644 ---
>> a/meta/recipes-devtools/python/python-native_2.7.3.bb +++
>> b/meta/recipes-devtools/python/python-native_2.7.3.bb @@ -21,7 +21,7 
>> @@
>> SRC_URI += " " S = "${WORKDIR}/Python-${PV}" -FILESPATH =
>> "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit native diff
>> --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
>> b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb index
>> 9dbe47c..691666c 100644 ---
>> a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb +++
>> b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb @@ -16,7
>> +16,7 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
>> SRC_URI[sha256sum] =
>> "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6" S 
>> =
>> "${WORKDIR}/pygobject-${PV}" -FILESPATH =
>> "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> Is this one correct?
>
> There is
> BBCLASSEXTEND = "native"
>
> and prepending python-pygobject-native doesn't seem to be needed.

You're right, this is not needed for pygobject. Will fix this in v2.
>
>> EXTRA_OECONF += "--disable-introspection" PARALLEL_MAKEINST = "" --
>> 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