Skip to contentSkip to conversation

Remove usage of FILESPATH

PATCH Superseded Petter Mabäcker 3 participants 24 messages May 7, 2014 – May 9, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Petter Mabäcker

author
#0 lore raw

cover Remove usage of FILESPATH

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). These should be changed to use FILESEXTRAPATHS to extend the path instead or use a default FILESPATH (e.g. BP, BPN or files).

The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3:

cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05 09:05:42 +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 (13):
systemtap: remove usage of FILESPATH
dbus: remove usage of FILESPATH
gstreamer: remove unused FILESPATH
trace-cmd: remove usage of FILESPATH
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 +-
 .../0001-Add-eventfd_read-and-eventfd_write.patch  |    0
 ...nt.c-wtent.c-move-functions-from-utxent.c.patch |    0
 ...1-atexit_old-Do-not-add-it-to-shared-libc.patch |    0
 ...brt-Use-nodefaultlibs-instead-of-nostdlib.patch |    0
 ...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |    0
 ...rk-Hide-pthread_atfork-in-shared-versions.patch |    0
 .../0002-wire-setns-syscall.patch                  |    0
 ...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |    0
 .../0004-Add-clock_adjtime-syscall.patch           |    0
 .../{uclibc-git => files}/argp-headers.patch       |    0
 .../{uclibc-git => files}/argp-support.patch       |    0
 .../compile-arm-fork-with-O2.patch                 |    0
 .../uclibc/{uclibc-git => files}/locale.cfg        |    0
 .../uclibc/{uclibc-git => files}/obstack.cfg       |    0
 .../uclibc/{uclibc-git => files}/orign_path.patch  |    0
 .../{uclibc-git => files}/powerpc_copysignl.patch  |    0
 .../remove_attribute_optimize_Os.patch             |    0
 .../uclibc/{uclibc-git => files}/uClibc.distro     |    0
 .../uclibc/{uclibc-git => files}/uClibc.machine    |    0
 .../uclibc_enable_log2_test.patch                  |    0
 meta/recipes-core/uclibc/uclibc-git.inc            |    4 +---
 meta/recipes-devtools/gcc/gcc-4.8.inc              |    2 +-
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |    3 +--
 .../recipes-devtools/python/python-native_2.7.3.bb |    2 +-
 .../python/python-pygobject_2.28.3.bb              |    2 +-
 .../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 => files}/docproc-build-fix.patch   |    0
 .../obsolete_automake_macros.patch                 |    0
 meta/recipes-kernel/systemtap/systemtap_git.inc    |    2 --
 .../{trace-cmd => files}/addldflags.patch          |    0
 .../blktrace-api-compatibility.patch               |    0
 .../kernelshark-fix-syntax-error-of-shell.patch    |    0
 .../{trace-cmd => files}/make-docs-optional.patch  |    0
 ...dd-checks-for-invalid-pointers-to-fix-seg.patch |    0
 ...o-not-call-stop_threads-if-doing-latency-.patch |    0
 ...etting-plugin-to-nop-clears-data-before-i.patch |    0
 .../trace-cmd-fix-syntax-error-of-shell.patch      |    0
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |    2 --
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 --
 .../gstreamer/gstreamer1.0-plugins.inc             |    2 --
 48 files changed, 11 insertions(+), 27 deletions(-)
 rename meta/recipes-core/eglibc/{eglibc-2.19 => cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-Add-eventfd_read-and-eventfd_write.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-atexit_old-Do-not-add-it-to-shared-libc.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0002-wire-setns-syscall.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0004-Add-clock_adjtime-syscall.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/argp-headers.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/argp-support.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/compile-arm-fork-with-O2.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/locale.cfg (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/obstack.cfg (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/orign_path.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/powerpc_copysignl.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/remove_attribute_optimize_Os.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uClibc.distro (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uClibc.machine (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uclibc_enable_log2_test.patch (100%)
 rename meta/recipes-kernel/systemtap/{systemtap => files}/docproc-build-fix.patch (100%)
 rename meta/recipes-kernel/systemtap/{systemtap => files}/obsolete_automake_macros.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/addldflags.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/blktrace-api-compatibility.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/kernelshark-fix-syntax-error-of-shell.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/make-docs-optional.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-fix-syntax-error-of-shell.patch (100%)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/13 systemtap: remove usage of FILESPATH

Fixes [YOCTO #4497]

Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. All current patches in systemtap are shared, move them to files dir instead, since it's included in base FILESPATH.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../{systemtap => files}/docproc-build-fix.patch   |    0
 .../obsolete_automake_macros.patch                 |    0
 meta/recipes-kernel/systemtap/systemtap_git.inc    |    2 --
 3 files changed, 2 deletions(-)
 rename meta/recipes-kernel/systemtap/{systemtap => files}/docproc-build-fix.patch (100%)
 rename meta/recipes-kernel/systemtap/{systemtap => files}/obsolete_automake_macros.patch (100%)
meta/recipes-kernel/systemtap/files/docproc-build-fix.patch renamed from meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
rename to meta/recipes-kernel/systemtap/files/docproc-build-fix.patch
meta/recipes-kernel/systemtap/files/obsolete_automake_macros.patch renamed from meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
rename to meta/recipes-kernel/systemtap/files/obsolete_automake_macros.patch
meta/recipes-kernel/systemtap/systemtap_git.inc +0 -2
index c280313..0d68dd1 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 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. Avoid using filesdir in dbus, since current patchdirs are only shared between some of the dbus bb-files.

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 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 4/13 trace-cmd: 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. All current patches in trace-cmd are shared, move them to files instead, since it's included in base FILESPATH.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../{trace-cmd => files}/addldflags.patch          |    0
 .../blktrace-api-compatibility.patch               |    0
 .../kernelshark-fix-syntax-error-of-shell.patch    |    0
 .../{trace-cmd => files}/make-docs-optional.patch  |    0
 ...dd-checks-for-invalid-pointers-to-fix-seg.patch |    0
 ...o-not-call-stop_threads-if-doing-latency-.patch |    0
 ...etting-plugin-to-nop-clears-data-before-i.patch |    0
 .../trace-cmd-fix-syntax-error-of-shell.patch      |    0
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |    2 --
 9 files changed, 2 deletions(-)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/addldflags.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/blktrace-api-compatibility.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/kernelshark-fix-syntax-error-of-shell.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/make-docs-optional.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-fix-syntax-error-of-shell.patch (100%)
meta/recipes-kernel/trace-cmd/files/addldflags.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
rename to meta/recipes-kernel/trace-cmd/files/addldflags.patch
meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
rename to meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch
meta/recipes-kernel/trace-cmd/files/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/files/kernelshark-fix-syntax-error-of-shell.patch
meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
rename to meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +0 -2
index d61097d..291c068 100644
@@ -21,8 +21,6 @@ S = "${WORKDIR}/git"
 
 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
Signature · 1 line
1.7.9.5
author
#7 lore raw

PATCH 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. Avoid using files dir in xorg-lib, since current patchdirs are only shared between some of the bb-files.

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
#8 lore raw

PATCH 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. 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 <[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
#11 lore raw

PATCH 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
#12 lore raw

PATCH 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. Instead FILESEXTRAPATHS should be used to extend the path.

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

@@ -15,8 +16,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 () {
Signature · 1 line
1.7.9.5
author
#15 lore raw

PATCH 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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-4.8.inc +1 -1
index 42b4212..bce9b81 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"
Signature · 1 line
1.7.9.5
author
#16 lore raw

PATCH 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 (e.g. BPN, BP and files).

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              |    2 +-
 2 files changed, 2 insertions(+), 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 +1 -1
index 9dbe47c..691666c 100644
@@ -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 = ""
Signature · 1 line
1.7.9.5
author
#21 lore raw

PATCH 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 d7bc444..5d42572 100644
@@ -14,7 +14,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
author
#19 lore raw

PATCH 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
#20 lore raw

PATCH 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. Current patchdir in uclibc are shared, rename them to files instead, since it's included in base FILESPATH.

Signed-off-by Petter Mabäcker <[email protected]>
---
 .../0001-Add-eventfd_read-and-eventfd_write.patch  |    0
 ...nt.c-wtent.c-move-functions-from-utxent.c.patch |    0
 ...1-atexit_old-Do-not-add-it-to-shared-libc.patch |    0
 ...brt-Use-nodefaultlibs-instead-of-nostdlib.patch |    0
 ...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |    0
 ...rk-Hide-pthread_atfork-in-shared-versions.patch |    0
 .../0002-wire-setns-syscall.patch                  |    0
 ...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |    0
 .../0004-Add-clock_adjtime-syscall.patch           |    0
 .../{uclibc-git => files}/argp-headers.patch       |    0
 .../{uclibc-git => files}/argp-support.patch       |    0
 .../compile-arm-fork-with-O2.patch                 |    0
 .../uclibc/{uclibc-git => files}/locale.cfg        |    0
 .../uclibc/{uclibc-git => files}/obstack.cfg       |    0
 .../uclibc/{uclibc-git => files}/orign_path.patch  |    0
 .../{uclibc-git => files}/powerpc_copysignl.patch  |    0
 .../remove_attribute_optimize_Os.patch             |    0
 .../uclibc/{uclibc-git => files}/uClibc.distro     |    0
 .../uclibc/{uclibc-git => files}/uClibc.machine    |    0
 .../uclibc_enable_log2_test.patch                  |    0
 meta/recipes-core/uclibc/uclibc-git.inc            |    4 +---
 21 files changed, 1 insertion(+), 3 deletions(-)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-Add-eventfd_read-and-eventfd_write.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-atexit_old-Do-not-add-it-to-shared-libc.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0002-wire-setns-syscall.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/0004-Add-clock_adjtime-syscall.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/argp-headers.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/argp-support.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/compile-arm-fork-with-O2.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/locale.cfg (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/obstack.cfg (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/orign_path.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/powerpc_copysignl.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/remove_attribute_optimize_Os.patch (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uClibc.distro (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uClibc.machine (100%)
 rename meta/recipes-core/uclibc/{uclibc-git => files}/uclibc_enable_log2_test.patch (100%)
meta/recipes-core/uclibc/files/0001-Add-eventfd_read-and-eventfd_write.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch
rename to meta/recipes-core/uclibc/files/0001-Add-eventfd_read-and-eventfd_write.patch
meta/recipes-core/uclibc/files/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
rename to meta/recipes-core/uclibc/files/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
meta/recipes-core/uclibc/files/0001-atexit_old-Do-not-add-it-to-shared-libc.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
rename to meta/recipes-core/uclibc/files/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
meta/recipes-core/uclibc/files/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
rename to meta/recipes-core/uclibc/files/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
meta/recipes-core/uclibc/files/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
rename to meta/recipes-core/uclibc/files/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
meta/recipes-core/uclibc/files/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch renamed from meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
rename to meta/recipes-core/uclibc/files/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
meta/recipes-core/uclibc/files/0002-wire-setns-syscall.patch renamed from meta/recipes-core/uclibc/uclibc-git/0002-wire-setns-syscall.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0002-wire-setns-syscall.patch
rename to meta/recipes-core/uclibc/files/0002-wire-setns-syscall.patch
meta/recipes-core/uclibc/files/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch renamed from meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch
rename to meta/recipes-core/uclibc/files/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch
meta/recipes-core/uclibc/files/0004-Add-clock_adjtime-syscall.patch renamed from meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch
rename to meta/recipes-core/uclibc/files/0004-Add-clock_adjtime-syscall.patch
meta/recipes-core/uclibc/files/argp-headers.patch renamed from meta/recipes-core/uclibc/uclibc-git/argp-headers.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/argp-headers.patch
rename to meta/recipes-core/uclibc/files/argp-headers.patch
meta/recipes-core/uclibc/files/argp-support.patch renamed from meta/recipes-core/uclibc/uclibc-git/argp-support.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/argp-support.patch
rename to meta/recipes-core/uclibc/files/argp-support.patch
meta/recipes-core/uclibc/files/compile-arm-fork-with-O2.patch renamed from meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch
rename to meta/recipes-core/uclibc/files/compile-arm-fork-with-O2.patch
meta/recipes-core/uclibc/files/locale.cfg renamed from meta/recipes-core/uclibc/uclibc-git/locale.cfg +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/locale.cfg
rename to meta/recipes-core/uclibc/files/locale.cfg
meta/recipes-core/uclibc/files/obstack.cfg renamed from meta/recipes-core/uclibc/uclibc-git/obstack.cfg +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/obstack.cfg
rename to meta/recipes-core/uclibc/files/obstack.cfg
meta/recipes-core/uclibc/files/orign_path.patch renamed from meta/recipes-core/uclibc/uclibc-git/orign_path.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/orign_path.patch
rename to meta/recipes-core/uclibc/files/orign_path.patch
meta/recipes-core/uclibc/files/powerpc_copysignl.patch renamed from meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
rename to meta/recipes-core/uclibc/files/powerpc_copysignl.patch
meta/recipes-core/uclibc/files/remove_attribute_optimize_Os.patch renamed from meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch
rename to meta/recipes-core/uclibc/files/remove_attribute_optimize_Os.patch
meta/recipes-core/uclibc/files/uClibc.distro renamed from meta/recipes-core/uclibc/uclibc-git/uClibc.distro +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/uClibc.distro
rename to meta/recipes-core/uclibc/files/uClibc.distro
meta/recipes-core/uclibc/files/uClibc.machine renamed from meta/recipes-core/uclibc/uclibc-git/uClibc.machine +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/uClibc.machine
rename to meta/recipes-core/uclibc/files/uClibc.machine
meta/recipes-core/uclibc/files/uclibc_enable_log2_test.patch renamed from meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch +0 -0
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch
rename to meta/recipes-core/uclibc/files/uclibc_enable_log2_test.patch
meta/recipes-core/uclibc/uclibc-git.inc +1 -3
index 0649aca..8442269 100644
@@ -2,8 +2,6 @@ SRCREV="5eddde8f094ef52dca06695cc598e3b2556dcccb"
 
 PV = "0.9.33+git${SRCPV}"
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}"
-
 SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
 	file://uClibc.machine \
 	file://uClibc.distro \

@@ -24,6 +22,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
#22 lore raw
In reply to Petter Mabäcker
Quoted 7 lines · Petter Mabäcker

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). These should be changed to use FILESEXTRAPATHS to extend the path instead or use a default FILESPATH (e.g. BP, BPN or files).

Whilst FILESPATH is discouraged, so is putting files into "files" directories so those changes are not an improvement.

Cheers,

Richard

author
#23 lore raw

2014-05-08 00:21 skrev Richard Purdie:

Quoted 9 lines · Petter Mabäcker
Quoted 7 lines

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). These should be changed to use FILESEXTRAPATHS to extend the path instead or use a default FILESPATH (e.g. BP, BPN or files).

Quoted 6 lines

Whilst FILESPATH is discouraged, so is putting files into "files" directories so those changes are not an improvement.

Cheers,

Richard

I agree, 'files' is not a good choice and of course BP and BPN are preferred if possible. My intention in this case however was that 'files' was an "less bad" option in the situations where all bb-files within a recipe used a 'common' dir to store patches. In these situations I thought it was more clear to use a name that better displayed the "common use" and since 'files' is quite a common name + that it removes the need of extending the filespath, I used it in theses situations. But I guess you could see 'BPN' as a common dir as well since it's the same name as the recipe (even if they are used by other bb-files with different PN within the same recipe). So I will change those commits that are using 'files' and use either BPN as a "shared patchdir" or try to split them into different PN/P dirs if possible.

BR,
Petter

#5 lore raw

Re: [PATCH 04/13] trace-cmd: remove usage of FILESPATH

In reply to Petter Mabäcker
Quoted 5 lines · Petter Mabäcker

Fixes [YOCTO #4497]

Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. All current patches in trace-cmd are shared, move them to files instead, since it's included in base FILESPATH.

FWIW: using "files" is also a bit discouraged, because it's searched last, so the lookup takes longer (trying ~30 different directories a lot more with more OVERRIDES).

I don't know what's worse.

Quoted 74 lines
Signed-off-by Petter Mabäcker <[email protected]>
---
 .../{trace-cmd => files}/addldflags.patch          |    0
 .../blktrace-api-compatibility.patch               |    0
 .../kernelshark-fix-syntax-error-of-shell.patch    |    0
 .../{trace-cmd => files}/make-docs-optional.patch  |    0
 ...dd-checks-for-invalid-pointers-to-fix-seg.patch |    0
 ...o-not-call-stop_threads-if-doing-latency-.patch |    0
 ...etting-plugin-to-nop-clears-data-before-i.patch |    0
 .../trace-cmd-fix-syntax-error-of-shell.patch      |    0
 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |    2 --
 9 files changed, 2 deletions(-)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/addldflags.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/blktrace-api-compatibility.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/kernelshark-fix-syntax-error-of-shell.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/make-docs-optional.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch (100%)
 rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-fix-syntax-error-of-shell.patch (100%)
meta/recipes-kernel/trace-cmd/files/addldflags.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
rename to meta/recipes-kernel/trace-cmd/files/addldflags.patch
meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
rename to meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch
meta/recipes-kernel/trace-cmd/files/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/files/kernelshark-fix-syntax-error-of-shell.patch
meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
rename to meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch renamed from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch +0 -0
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
rename to meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +0 -2
index d61097d..291c068 100644
@@ -21,8 +21,6 @@ S = "${WORKDIR}/git"
 
 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
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#17 lore raw

Re: [PATCH 10/13] python: remove usage of FILESPATH

In reply to Petter Mabäcker
Quoted 31 lines · 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 (e.g. BPN, BP and files).

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              |    2 +-
 2 files changed, 2 insertions(+), 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 -0
index 9dbe47c..691666c 100644

meta/recipes-devtools/python/python-pygobject_2.28.3.bb SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9" · line 19

Quoted 5 lines
meta/recipes-devtools/python/python-pygobject_2.28.3.bb +1 -1
@@ -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.

Quoted 11 lines
meta/recipes-devtools/python/python-pygobject_2.28.3.bb +0 -0
 EXTRA_OECONF += "--disable-introspection"
 
 PARALLEL_MAKEINST = ""
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#9 lore raw

Re: [PATCH 06/13] mesa: remove usage of FILESPATH

In reply to Petter Mabäcker
Quoted 17 lines · 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. 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 <[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 +0 -0
index 8c7d8e8..9059207 100644

meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb require mesa_${PV}.bb · line 5

Quoted 5 lines
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +1 -1
@@ -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?

Quoted 11 lines
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +0 -0
 PROVIDES = "virtual/libgl virtual/mesa"
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#13 lore raw

Re: [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH

In reply to Petter Mabäcker
Quoted 15 lines · 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]>
---
 .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +0 -0
index fce4178..4f908c3 100644

meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931" · line 8

Quoted 4 lines
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +1 -0
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931"
 
 DEPENDS = "groff-native openjade-native"
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/linuxdoc-tools-native:"

Please use

git mv meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools

instead

Quoted 20 lines
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +0 -2
 SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
            file://disable_sgml2rtf.patch \

@@ -15,8 +16,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 () {
Signature · 7 lines
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#14 lore raw

Re: [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH

2014-05-08 12:50 skrev Martin Jansa:

Quoted 25 lines · Petter Mabäcker
Quoted 18 lines

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]> --- .../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb | 3 +-- 1 file
changed, 1 insertion(+), 2 deletions(-) diff --git

a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb

b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb index fce4178..4f908c3 100644 ---

a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
+++

b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb

(quoted diff) +0 -0
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM =
Quoted 3 lines

"file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931" DEPENDS = "groff-native openjade-native" +FILESEXTRAPATHS_prepend := "${THISDIR}/linuxdoc-tools-native:"

Please use

Quoted 4 lines

git mv meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools

instead

Good point, feels like a better way to solve it that way. Will fix this in v2.

Quoted 15 lines
Quoted 3 lines

SRC_URI =

"${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz

Quoted 10 lines

file://disable_sgml2rtf.patch [1] @@ -15,8 +16,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 () { -- 1.7.9.5 -- _______________________________________________ Openembedded-core mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core [2]

Links:
------
[1] file://disable_sgml2rtf.patch
[2] http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#6 lore raw

Re: [PATCH 04/13] trace-cmd: remove usage of FILESPATH

In reply to Martin Jansa

2014-05-08 12:46 skrev Martin Jansa:

Quoted 7 lines · Petter Mabäcker
Quoted 5 lines

Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. All current patches in trace-cmd are shared, move them to files instead, since it's included in base FILESPATH.

Quoted 6 lines

FWIW: using "files" is also a bit discouraged, because it's searched last, so the lookup takes longer (trying ~30 different directories a lot more with more OVERRIDES).

I don't know what's worse.

Interesting, never thought about that. Richard also dissuade me from using it. I will look into this a little bit more and send up a v2.

Quoted 23 lines
Quoted 23 lines
Signed-off-by Petter Mabäcker <[email protected]> --- .../{trace-cmd

=> files}/addldflags.patch | 0 .../blktrace-api-compatibility.patch | 0 .../kernelshark-fix-syntax-error-of-shell.patch | 0 .../{trace-cmd => files}/make-docs-optional.patch | 0

...dd-checks-for-invalid-pointers-to-fix-seg.patch | 0
...o-not-call-stop_threads-if-doing-latency-.patch | 0
...etting-plugin-to-nop-clears-data-before-i.patch | 0

.../trace-cmd-fix-syntax-error-of-shell.patch | 0 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 2 -- 9 files changed, 2 deletions(-) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/addldflags.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/blktrace-api-compatibility.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/kernelshark-fix-syntax-error-of-shell.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/make-docs-optional.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch (100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch

Quoted 9 lines
Quoted 8 lines

(100%) rename meta/recipes-kernel/trace-cmd/{trace-cmd => files}/trace-cmd-fix-syntax-error-of-shell.patch (100%) diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/files/addldflags.patch similarity index 100% rename from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch rename to meta/recipes-kernel/trace-cmd/files/addldflags.patch diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch

Quoted 11 lines
Quoted 4 lines

b/meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch

Quoted 4 lines

rename to meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch

Quoted 2 lines
Quoted 1 line

b/meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch

Quoted 3 lines
Quoted 2 lines

similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch

Quoted 3 lines
Quoted 2 lines

rename to

meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch

Quoted 9 lines
Quoted 8 lines

diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch similarity index 100% rename from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch rename to meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch

Quoted 2 lines
Quoted 1 line

b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch

Quoted 3 lines
Quoted 2 lines

similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch

Quoted 3 lines
Quoted 2 lines

rename to

meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch

Quoted 3 lines
Quoted 2 lines

diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch

Quoted 2 lines
Quoted 1 line

b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch

Quoted 3 lines
Quoted 2 lines

similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch

Quoted 3 lines
Quoted 2 lines

rename to

meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch

Quoted 3 lines
Quoted 2 lines

diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch

Quoted 2 lines
Quoted 1 line

b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch

Quoted 3 lines
Quoted 2 lines

similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch

Quoted 3 lines
Quoted 2 lines

rename to

meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch

Quoted 3 lines
Quoted 2 lines

diff --git

a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch

Quoted 2 lines
Quoted 1 line

b/meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch

Quoted 3 lines
Quoted 2 lines

similarity index 100% rename from

meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch

Quoted 3 lines
Quoted 2 lines

rename to

meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch

Quoted 4 lines
Quoted 4 lines
(quoted diff) +0 -0

b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb index d61097d..291c068 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +++

Quoted 8 lines
Quoted 8 lines

b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb @@ -21,8 +21,6 @@ S = "${WORKDIR}/git" 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 -- 1.7.9.5 -- _______________________________________________ Openembedded-core mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]

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

author
#18 lore raw

Re: [PATCH 10/13] python: remove usage of FILESPATH

In reply to Martin Jansa

2014-05-08 12:53 skrev Martin Jansa:

Quoted 33 lines · Petter Mabäcker
Quoted 21 lines

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 <[email protected]> --- .../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 ---

Quoted 8 lines

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?

Quoted 4 lines

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.

Quoted 5 lines
Quoted 5 lines

EXTRA_OECONF += "--disable-introspection" PARALLEL_MAKEINST = "" -- 1.7.9.5 -- _______________________________________________ Openembedded-core mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]

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

author
#10 lore raw

Re: [PATCH 06/13] mesa: remove usage of FILESPATH

In reply to Martin Jansa

2014-05-08 12:49 skrev Martin Jansa:

Quoted 18 lines · Petter Mabäcker
Quoted 16 lines

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 <[email protected]> --- 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:"

Quoted 2 lines

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?

Quoted 5 lines
Quoted 5 lines

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

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