Skip to contentSkip to conversation

Remove usage of FILESPATH

PATCH Superseded Petter Mabäcker 3 participants 19 messages May 10, 2014 – May 11, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Petter Mabäcker

author
#0 lore raw

v2 cover Remove usage of FILESPATH

v2 of the changeset.

Fixes [YOCTO #4497]

We extend the search path in a number of recipes by setting FILESPATH, which is not really desirable since the manner in which we have done it can make the recipe harder to bbappend (and we explicitly advise modifying FILESPATH this in the manual).

The following changes since commit 646b089c38623cebe4a6b22c6798d21453fe5257:

bitbake: toaster: modify SQL data type constraints (2014-05-08 16:18:12 +0100)

are available in the git repository at:

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

Petter Mabäcker (13):
systemtap: remove usage of FILESPATH
dbus: remove usage of FILESPATH
gstreamer: remove unused FILESPATH
trace-cmd: refactoring recipe
xorg-lib: remove usage of FILESPATH
mesa: remove usage of FILESPATH
qemu: remove unused FILESPATH
linuxdoc-tools: remove usage of FILESPATH
gcc: remove usage of FILESPATH
python: remove usage of FILESPATH
u-boot: remove unused FILESPATH
uclibc: remove usage of FILESPATH
eglibc: remove usage of FILESPATH

 meta/recipes-bsp/u-boot/u-boot.inc                 |    1 -
 meta/recipes-core/dbus/dbus-test_1.6.18.bb         |    2 +-
 .../fix_for_centos_5.8.patch                       |    0
 .../eglibc/cross-localedef-native_2.19.bb          |    3 +--
 meta/recipes-core/eglibc/eglibc_2.19.bb            |    4 +---
 meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |    2 +-
 meta/recipes-core/uclibc/uclibc-git.inc            |    4 ++--
 meta/recipes-devtools/gcc/gcc-4.8.inc              |    4 ++--
 meta/recipes-devtools/gcc/gcc-4.9.inc              |    4 ++--
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |    3 ---
 .../disable_dvips_doc.patch                        |    0
 .../disable_sgml2rtf.patch                         |    0
 .../disable_tex_doc.patch                          |    0
 .../disable_txt_doc.patch                          |    0
 .../recipes-devtools/python/python-native_2.7.3.bb |    2 +-
 .../python/python-pygobject_2.28.3.bb              |    1 -
 .../qemu/nativesdk-qemu-helper_1.0.bb              |    1 -
 meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb        |    2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc          |    2 +-
 .../systemtap/systemtap-uprobes_git.bb             |    2 ++
 meta/recipes-kernel/systemtap/systemtap_git.inc    |    2 --
 .../kernelshark-fix-syntax-error-of-shell.patch    |    0
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |   18 ++++--------------
 meta/recipes-kernel/trace-cmd/trace-cmd.inc        |   14 ++++++++++++++
 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |   16 ++++------------
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 --
 .../gstreamer/gstreamer1.0-plugins.inc             |    2 --
 27 files changed, 37 insertions(+), 54 deletions(-)
 rename meta/recipes-core/eglibc/{eglibc-2.19 => cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_dvips_doc.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_sgml2rtf.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_tex_doc.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_txt_doc.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
 create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/13 systemtap: remove usage of FILESPATH

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../systemtap/systemtap-uprobes_git.bb             |    2 ++
 meta/recipes-kernel/systemtap/systemtap_git.inc    |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +2 -0
index ab9acba..7d76b52 100644
@@ -11,6 +11,8 @@ ALLOW_EMPTY_${PN} = "1"
 
 inherit module-base gettext
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"
+
 FILES_${PN} += "${datadir}/systemtap/runtime/uprobes"
 
 EXTRA_OEMAKE = ""
meta/recipes-kernel/systemtap/systemtap_git.inc +0 -2
index 78439c1..717d66f 100644
@@ -8,8 +8,6 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \
            file://obsolete_automake_macros.patch \
           "
 
-FILESPATH = "${FILE_DIRNAME}/systemtap"
-
 # systemtap doesn't support mips
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH v2 2/13 dbus: remove usage of FILESPATH

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-core/dbus/dbus-test_1.6.18.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/dbus/dbus-test_1.6.18.bb +1 -1
index 9ea0f4d..bff1a46 100644
@@ -23,7 +23,7 @@ SRC_URI[md5sum] = "b02e9c95027a416987b81f9893831061"
 SRC_URI[sha256sum] = "7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd"
 
 S="${WORKDIR}/dbus-${PV}"
-FILESPATH = "${FILE_DIRNAME}/dbus"
+FILESEXTRAPATHS_prepend := "${THISDIR}/dbus:"
 
 inherit autotools pkgconfig gettext ptest
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH v2 3/13 gstreamer: remove unused FILESPATH

In reply to Petter Mabäcker

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. However in gstreamer no FILESPATH additions are currently needed so instead it should be removed.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 --
 .../gstreamer/gstreamer1.0-plugins.inc             |    2 --
 2 files changed, 4 deletions(-)
meta/recipes-multimedia/gstreamer/gst-plugins.inc +0 -2
index b2d3d3c..2697609 100644
@@ -6,8 +6,6 @@ DEPENDS = "gstreamer"
 
 inherit autotools pkgconfig
 
-FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
-
 SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 GSTREAMER_DEBUG ?= "--disable-debug"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +0 -2
index 4ab8ea8..687aa2f 100644
@@ -6,8 +6,6 @@ DEPENDS = "gstreamer1.0"
 
 inherit autotools pkgconfig
 
-FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
-
 GSTREAMER_1_0_DEBUG ?= "--disable-debug"
 GSTREAMER_1_0_GIT_BRANCH ?= "master"
 EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples "
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH v2 4/13 trace-cmd: refactoring recipe

In reply to Petter Mabäcker

Fixes [YOCTO #4497]

Refactoring recipe to avoid duplicated entries in trace-cmd and kernelshark bb-files. Also remove usage of FILESPATH and split package unique patches into separate dirs.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../kernelshark-fix-syntax-error-of-shell.patch    |    0
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |   18 ++++--------------
 meta/recipes-kernel/trace-cmd/trace-cmd.inc        |   14 ++++++++++++++
 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |   16 ++++------------
 4 files changed, 22 insertions(+), 26 deletions(-)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
 create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
rename to meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +4 -14
index d61097d..e64abe2 100644
@@ -1,28 +1,18 @@
 SUMMARY = "Graphical trace viewer for Ftrace"
 LICENSE = "GPLv2"
+
+require trace-cmd.inc
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
 
-SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r3"
-PV = "1.2+git${SRCPV}"
-
 DEPENDS = "gtk+"
 RDEPENDS_${PN} = "trace-cmd"
 
-inherit pkgconfig pythonnative
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
-           file://addldflags.patch \
-           file://make-docs-optional.patch \
-           file://blktrace-api-compatibility.patch \
-           file://kernelshark-fix-syntax-error-of-shell.patch"
-S = "${WORKDIR}/git"
+SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
 
-FILESPATH = "${FILE_DIRNAME}/trace-cmd"
-
 do_install() {
 	oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
 	rm -rf ${D}${datadir}/trace-cmd
meta/recipes-kernel/trace-cmd/trace-cmd.inc new file +14 -0
new file mode 100644
index 0000000..2c8d83d
@@ -0,0 +1,14 @@
+SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
+PR = "r3"
+PV = "1.2+git${SRCPV}"
+
+inherit pkgconfig pythonnative
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/trace-cmd:"
+
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
+           file://addldflags.patch \
+           file://make-docs-optional.patch \
+           file://blktrace-api-compatibility.patch \
+"
+S = "${WORKDIR}/git"
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb +4 -12
index a0c823b..6f3319d 100644
@@ -1,26 +1,18 @@
 SUMMARY = "User interface to Ftrace"
 LICENSE = "GPLv2 & LGPLv2.1"
+
+require trace-cmd.inc
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
                     file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
                     file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b"
 
-SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r3"
-PV = "1.2+git${SRCPV}"
-
-inherit pkgconfig pythonnative
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
-           file://addldflags.patch \
-           file://make-docs-optional.patch \
-           file://blktrace-api-compatibility.patch \
-           file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
+SRC_URI_append = "file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
            file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \
            file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \
            file://trace-cmd-fix-syntax-error-of-shell.patch \
 "
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "'prefix=${prefix}'"
Signature · 1 line
1.7.9.5
author
#5 lore raw

PATCH v2 5/13 xorg-lib: remove usage of FILESPATH

In reply to Petter Mabäcker

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-graphics/xorg-lib/libx11.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libx11.inc +1 -1
index e07d42d..6c45828 100644
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
 
 inherit siteinfo
 
-FILESPATH = "${FILE_DIRNAME}/libx11"
+FILESEXTRAPATHS_prepend := "${THISDIR}/libx11:"
 
 PE = "1"
Signature · 1 line
1.7.9.5
author
#6 lore raw

PATCH v2 6/13 mesa: remove usage of FILESPATH

In reply to Petter Mabäcker

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. Also remove unused filespath addition.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +1 -1
index 8c7d8e8..9059207 100644
@@ -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"
Signature · 1 line
1.7.9.5
author
#7 lore raw

PATCH v2 7/13 qemu: remove unused FILESPATH

In reply to Petter Mabäcker

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. However in nativesdk-qemu-helper no FILESPATH additions are currently needed so instead it should be removed.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../qemu/nativesdk-qemu-helper_1.0.bb              |    1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +0 -1
index fe03b82..51d1c59 100644
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
 RDEPENDS_${PN} = "nativesdk-qemu"
 PR = "r9"
 
-FILESPATH = "${FILE_DIRNAME}/qemu-helper"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
                     file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b"
Signature · 1 line
1.7.9.5
author
#8 lore raw

PATCH v2 8/13 linuxdoc-tools: remove usage of FILESPATH

In reply to Petter Mabäcker

Fixes [YOCTO #4497]

Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |    3 ---
 .../disable_dvips_doc.patch                        |    0
 .../disable_sgml2rtf.patch                         |    0
 .../disable_tex_doc.patch                          |    0
 .../disable_txt_doc.patch                          |    0
 5 files changed, 3 deletions(-)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_dvips_doc.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_sgml2rtf.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_tex_doc.patch (100%)
 rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native => linuxdoc-tools}/disable_txt_doc.patch (100%)
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +0 -3
index fce4178..ed6ab73 100644
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931"
 
 DEPENDS = "groff-native openjade-native"
 
-
 SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
            file://disable_sgml2rtf.patch \
            file://disable_txt_doc.patch \

@@ -15,8 +14,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.
 SRC_URI[md5sum] = "1d13d500918a7a145b0edc2f16f61dd1"
 SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101"
 
-FILESPATH = "${FILE_DIRNAME}/linuxdoc-tools-native/"
-
 inherit autotools-brokensep native
 
 do_configure () {
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch renamed from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
rename to meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch renamed from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
rename to meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch renamed from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
rename to meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch renamed from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
rename to meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
Signature · 1 line
1.7.9.5
author
#9 lore raw

PATCH v2 9/13 gcc: remove usage of FILESPATH

In reply to Petter Mabäcker

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-devtools/gcc/gcc-4.8.inc |    4 ++--
 meta/recipes-devtools/gcc/gcc-4.9.inc |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/gcc/gcc-4.8.inc +2 -2
index 42b4212..fe20b12 100644
@@ -8,7 +8,7 @@ PV = "4.8.2"
 
 BINV = "4.8.2"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/gcc-4.8:"
 
 DEPENDS =+ "mpfr gmp libmpc zlib"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"

@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
                    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-		   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
+                   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://0002-uclibc-conf.patch \
meta/recipes-devtools/gcc/gcc-4.9.inc +2 -2
index 865ec47..5d46bdf 100644
@@ -8,7 +8,7 @@ PV = "4.9.0"
 
 BINV = "4.9.0"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.9' ], d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/gcc-4.9:"
 
 DEPENDS =+ "mpfr gmp libmpc zlib"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"

@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
                    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-		   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
+                   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
Signature · 1 line
1.7.9.5
author
#10 lore raw

PATCH v2 10/13 python: remove usage of FILESPATH

In reply to Petter Mabäcker

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../recipes-devtools/python/python-native_2.7.3.bb |    2 +-
 .../python/python-pygobject_2.28.3.bb              |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/python/python-native_2.7.3.bb +1 -1
index 0c66d27..4949546 100644
@@ -21,7 +21,7 @@ SRC_URI += "\
            "
 S = "${WORKDIR}/Python-${PV}"
 
-FILESPATH = "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 inherit native
meta/recipes-devtools/python/python-pygobject_2.28.3.bb +0 -1
index 9dbe47c..2e65b38 100644
@@ -16,7 +16,6 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
 SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
 S = "${WORKDIR}/pygobject-${PV}"
 
-FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
 EXTRA_OECONF += "--disable-introspection"
 
 PARALLEL_MAKEINST = ""
Signature · 1 line
1.7.9.5
author
#11 lore raw

PATCH v2 11/13 u-boot: remove unused FILESPATH

In reply to Petter Mabäcker

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. However in u-boot no FILESPATH additions are currently needed so instead it should be removed.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-bsp/u-boot/u-boot.inc |    1 -
 1 file changed, 1 deletion(-)
meta/recipes-bsp/u-boot/u-boot.inc +0 -1
index cb50949..d826a40 100644
@@ -65,7 +65,6 @@ do_install () {
 }
 
 FILES_${PN} = "/boot ${sysconfdir}"
-FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
 
 do_deploy () {
     install -d ${DEPLOYDIR}
Signature · 1 line
1.7.9.5
author
#12 lore raw

PATCH v2 12/13 uclibc: remove usage of FILESPATH

In reply to Petter Mabäcker

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.

Signed-off-by Petter Mabäcker <[email protected]>
---
 meta/recipes-core/uclibc/uclibc-git.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/uclibc/uclibc-git.inc +2 -2
index 0649aca..4790852 100644
@@ -2,7 +2,7 @@ SRCREV="5eddde8f094ef52dca06695cc598e3b2556dcccb"
 
 PV = "0.9.33+git${SRCPV}"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/uclibc-git:"
 
 SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
 	file://uClibc.machine \

@@ -24,6 +24,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
 	file://0001-Add-eventfd_read-and-eventfd_write.patch \
 	file://0002-wire-setns-syscall.patch \
 	file://0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch \
-        file://0004-Add-clock_adjtime-syscall.patch \ 
+	file://0004-Add-clock_adjtime-syscall.patch \ 
 	"
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.9.5
author
#13 lore raw

PATCH v2 13/13 eglibc: remove usage of FILESPATH

In reply to Petter Mabäcker

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. If possible try to use any of the default FILESPATH dirs.

Also remove superfluous comment and do minor indentation fix.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../fix_for_centos_5.8.patch                       |    0
 .../eglibc/cross-localedef-native_2.19.bb          |    3 +--
 meta/recipes-core/eglibc/eglibc_2.19.bb            |    4 +---
 meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |    2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename meta/recipes-core/eglibc/{eglibc-2.19 => cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch renamed from meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch +0 -0
similarity index 100%
rename from meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
rename to meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
meta/recipes-core/eglibc/cross-localedef-native_2.19.bb +1 -2
index 3ce0e1d..87b5a6d 100644
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b
 inherit native
 inherit autotools
 
-# pick up an eglibc patch
-FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \
 	   file://fix_for_centos_5.8.patch;patchdir=.. \
meta/recipes-core/eglibc/eglibc_2.19.bb +1 -3
index 8f09676..1ddce82 100644
@@ -24,7 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
            file://0001-R_ARM_TLS_DTPOFF32.patch \
            file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
            file://fix-tibetian-locales.patch \
-	   file://ppce6500-32b_slow_ieee754_sqrt.patch \
+           file://ppce6500-32b_slow_ieee754_sqrt.patch \
           "
 SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
 SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"

@@ -49,8 +49,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
 
 GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
 # and our build is not a uclibc one, and we skip a glibc one if our build
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb +1 -1
index 75ffbf6..8f0b89b 100644
@@ -16,7 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
 
 PR = "r2"
 
-FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}/"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 inherit native
Signature · 1 line
1.7.9.5
#14 lore raw

Re: [PATCHv2 01/13] systemtap: remove usage of FILESPATH

In reply to Petter Mabäcker
Quoted 1 line · Petter Mabäcker

+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"

would something like

FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"

avoid the prepend and immediate evaluation

author
#15 lore raw

Re: [PATCHv2 01/13] systemtap: remove usage of FILESPATH

2014-05-10 18:58 skrev Khem Raj:

Quoted 10 lines
Quoted 1 line · Petter Mabäcker

+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"

would something like

FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"

avoid the prepend and immediate evaluation

I guess someone with deep bitbake knowledge can answer this better. But as far as I understand, you should always use immediate evaluation when using THISDIR, to be extra safe. Not sure if it's more safe to use FILE_DIRNAME if you want to avoid immediate expanding when using FILESEXTRAPATHS?

The bitbake documentations says:

"The operators "_append" and "_prepend" differ from the operators ".=" and "=." in that they are deferred until after parsing completes rather than being immediately applied."

Not sure if above means that "=." will also immediately expand variables or not?

Personally I have always used FILESEXTRAPATHS_prepend := "${THISDIR}/<somename>:" like the yocto documentation recommends. But sure if you can avoid immediate expanding in FILESEXTRPATHS, that would mean a tiny optimization. In that case perhaps the documentation should be updated as well. Looking in meta-layer both methods seems to be used.

#16 lore raw

Re: [PATCHv2 01/13] systemtap: remove usage of FILESPATH

Quoted 15 lines · On May 10, 2014, at 3:31 PM, [email protected] wrote:

2014-05-10 18:58 skrev Khem Raj:

Quoted 10 lines
Quoted 1 line · Petter Mabäcker

+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"

would something like

FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"

avoid the prepend and immediate evaluation

I guess someone with deep bitbake knowledge can answer this better. But as far as I understand, you should always use immediate evaluation when using THISDIR, to be extra safe. Not sure if it's more safe to use FILE_DIRNAME if you want to avoid immediate expanding when using FILESEXTRAPATHS?

Quoted 7 lines

The bitbake documentations says:

"The operators "_append" and "_prepend" differ from the operators ".=" and "=." in that they are deferred until after parsing completes rather than being immediately applied."

Not sure if above means that "=." will also immediately expand variables or not?

Personally I have always used FILESEXTRAPATHS_prepend := "${THISDIR}/<somename>:" like the yocto documentation recommends. But sure if you can avoid immediate expanding in FILESEXTRPATHS, that would mean a tiny optimization. In that case perhaps the documentation should be updated as well. Looking in meta-layer both methods seems to be used.

I was hinting on avoiding THISDIR but that does not solve the problem probably what you have it ok in this case.

#17 lore raw

Re: [PATCHv2 01/13] systemtap: remove usage of FILESPATH

In reply to [email protected]
Quoted 19 lines · On Sun, 2014-05-11 at 00:31 +0200, [email protected] wrote:

2014-05-10 18:58 skrev Khem Raj:

Quoted 10 lines
Quoted 1 line · Petter Mabäcker

+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"

would something like

FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"

avoid the prepend and immediate evaluation

I guess someone with deep bitbake knowledge can answer this better. But as far as I understand, you should always use immediate evaluation when using THISDIR, to be extra safe. Not sure if it's more safe to use FILE_DIRNAME if you want to avoid immediate expanding when using FILESEXTRAPATHS?

Quoted 8 lines

The bitbake documentations says:

"The operators "_append" and "_prepend" differ from the operators ".=" and "=." in that they are deferred until after parsing completes rather than being immediately applied."

Not sure if above means that "=." will also immediately expand variables or not?

They're not.

Quoted 5 lines

Personally I have always used FILESEXTRAPATHS_prepend := "${THISDIR}/<somename>:" like the yocto documentation recommends. But sure if you can avoid immediate expanding in FILESEXTRPATHS, that would mean a tiny optimization. In that case perhaps the documentation should be updated as well. Looking in meta-layer both methods seems to be used.

What Khem means is that in the case we know we're in the .bb file directory, we can use FILE_DIRNAME instead of using :=.

Why? FILE_DIRNAME is defined as:

conf/bitbake.conf:FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"

FILE will point to the .bb file.

Cheers,

Richard

author
#18 lore raw

Re: [PATCHv2 01/13] systemtap: remove usage of FILESPATH

Quoted 38 lines · Richard Purdie
Quoted 17 lines · On Sun, 2014-05-11 at 00:31 +0200, [email protected] wrote:

2014-05-10 18:58 skrev Khem Raj:

Quoted 9 lines
Quoted 1 line · Petter Mabäcker

+FILESEXTRAPATHS_prepend := "${THISDIR}/systemtap:"

would something like

FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"

avoid the prepend and immediate evaluation

I guess someone with deep bitbake knowledge can answer this better. But as far as I understand, you should always use immediate evaluation when using THISDIR, to be extra safe. Not sure if it's more safe to use FILE_DIRNAME if you want to avoid immediate expanding when using FILESEXTRAPATHS?

Quoted 8 lines

The bitbake documentations says:

"The operators "_append" and "_prepend" differ from the operators ".=" and "=." in that they are deferred until after parsing completes rather than being immediately applied."

Not sure if above means that "=." will also immediately expand variables or not?

They're not.

Quoted 5 lines

Personally I have always used FILESEXTRAPATHS_prepend := "${THISDIR}/<somename>:" like the yocto documentation recommends. But sure if you can avoid immediate expanding in FILESEXTRPATHS, that would mean a tiny optimization. In that case perhaps the documentation should be updated as well. Looking in meta-layer both methods seems to be used.

What Khem means is that in the case we know we're in the .bb file directory, we can use FILE_DIRNAME instead of using :=.

Why? FILE_DIRNAME is defined as:

Quoted 10 lines

conf/bitbake.conf:FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"

FILE will point to the .bb file.

Cheers,

Richard

Ok, that makes sense. I will send up a new changeset using this method instead.

BR,
Petter