Patchwork [1/1] clutter: remove usage of FILESPATH

login
register
mail settings
Submitter Petter Mabäcker
Date Oct. 17, 2013, 2:58 p.m.
Message ID <bc8fa586a4f02b66150aa279024d6907d7122ba6.1381985833.git.petter@technux.se>
Download mbox | patch
Permalink /patch/60137/
State New
Headers show

Comments

Petter Mabäcker - Oct. 17, 2013, 2:58 p.m.
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in clutter the default paths solves the problem if we
put all patches in ${BP} directory instead.

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 meta/classes/clutter.bbclass                       |    1 -
 .../enable_tests.patch                             |    0
 .../fix-wayland-deps.patch                         |    0
 .../cogl-1.14.patch                                |    0
 .../enable-tests.patch                             |    0
 .../fix-build-dir.patch                            |    0
 .../fix-test-includes.patch                        |    0
 7 files changed, 1 deletion(-)
 rename meta/recipes-graphics/clutter/{clutter-1.14 => clutter-1.0-1.14.4}/enable_tests.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-1.14 => clutter-1.0-1.14.4}/fix-wayland-deps.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst-1.6 => clutter-gst-1.0-1.6.0}/cogl-1.14.patch (100%)
 rename meta/recipes-graphics/clutter/{clutter-gst => clutter-gst-1.0-1.6.0}/enable-tests.patch (100%)
 rename meta/recipes-graphics/mx/{mx-1.4 => mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-build-dir.patch (100%)
 rename meta/recipes-graphics/mx/{mx => mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-test-includes.patch (100%)

diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
rename to meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch
rename to meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
rename to meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
rename to meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch
similarity index 100%
rename from meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
rename to meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch
similarity index 100%
rename from meta/recipes-graphics/mx/mx/fix-test-includes.patch
rename to meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch

Patch

diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
index 66a49bc..167407d 100644
--- a/meta/classes/clutter.bbclass
+++ b/meta/classes/clutter.bbclass
@@ -11,7 +11,6 @@  def get_real_name(n):
 
 VERMINOR = "${@get_minor_dir("${PV}")}"
 REALNAME = "${@get_real_name("${BPN}")}"
-FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}"
 
 CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"