Skip to contentSkip to conversation

clutter: remove usage of FILESPATH

PATCH New Petter Mabäcker 1 participant 2 messages Oct 17, 2013

lore
Share & tools
lore
#0 lore raw

cover clutter: remove usage of FILESPATH

This is a first changeset of trying to remove usage if FILESPATH (Bug 4497). I like the solution to always use ${P} or ${BP} (even if the recipe is alone), since that will (at least hopefully) force you to go through the file and/or patches when bumping a recipe to a newer version. One of the cons with this is of course that you more easily can miss re-create the patches-directory to reflect the new version but this should result in a build error (since the patch should exist in SRC_URI...).

Especially review the parts where I have moved patches located in both ${PN} and $PN-<something> into just ${P}.

BR,
Petter

The following changes since commit faf8f8660fae26a14578738b642fdeb08bcb9d54:

build-appliance: Update SRCREV for release (2013-10-11 23:13:07 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib petmab/bug/4497
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497

Petter Mabäcker (1):
clutter: remove usage of FILESPATH

 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%)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 clutter: remove usage of FILESPATH

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.

---
 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%)
meta/classes/clutter.bbclass +0 -1
index 66a49bc..167407d 100644
@@ -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"
 
meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch renamed from meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch +0 -0
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
meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch renamed from meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch +0 -0
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
meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch renamed from meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch +0 -0
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
meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch renamed from meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch +0 -0
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
meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch renamed from meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch +0 -0
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
meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch renamed from meta/recipes-graphics/mx/mx/fix-test-includes.patch +0 -0
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
Signature · 1 line
1.7.9.5