* [PATCH 01/13] systemtap: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 02/13] dbus: " Petter Mabäcker
` (12 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../{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%)
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/meta/recipes-kernel/systemtap/files/docproc-build-fix.patch
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
diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/meta/recipes-kernel/systemtap/files/obsolete_automake_macros.patch
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
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index c280313..0d68dd1 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -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'
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 02/13] dbus: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
2014-05-07 21:19 ` [PATCH 01/13] systemtap: remove " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 03/13] gstreamer: remove unused FILESPATH Petter Mabäcker
` (11 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
meta/recipes-core/dbus/dbus-test_1.6.18.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
index 9ea0f4d..bff1a46 100644
--- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 03/13] gstreamer: remove unused FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
2014-05-07 21:19 ` [PATCH 01/13] systemtap: remove " Petter Mabäcker
2014-05-07 21:19 ` [PATCH 02/13] dbus: " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 04/13] trace-cmd: remove usage of FILESPATH Petter Mabäcker
` (10 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
meta/recipes-multimedia/gstreamer/gst-plugins.inc | 2 --
.../gstreamer/gstreamer1.0-plugins.inc | 2 --
2 files changed, 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b2d3d3c..2697609 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -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"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 4ab8ea8..687aa2f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -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 "
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 04/13] trace-cmd: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (2 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 03/13] gstreamer: remove unused FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-08 10:46 ` Martin Jansa
2014-05-07 21:19 ` [PATCH 05/13] xorg-lib: " Petter Mabäcker
` (9 subsequent siblings)
13 siblings, 1 reply; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../{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%)
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 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
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 b/meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch
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
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 b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
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
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
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
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
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
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
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
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097d..291c068 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ 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
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 04/13] trace-cmd: remove usage of FILESPATH
2014-05-07 21:19 ` [PATCH 04/13] trace-cmd: remove usage of FILESPATH Petter Mabäcker
@ 2014-05-08 10:46 ` Martin Jansa
2014-05-08 14:56 ` petter
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2014-05-08 10:46 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 6050 bytes --]
On Wed, May 07, 2014 at 11:19:50PM +0200, Petter Mabäcker wrote:
> 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.
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
> .../{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%)
>
> 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 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
> 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 b/meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch
> 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
> 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 b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
> 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
> diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
> 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
> diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
> 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
> diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
> 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
> diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
> index d61097d..291c068 100644
> --- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
> +++ 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
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 04/13] trace-cmd: remove usage of FILESPATH
2014-05-08 10:46 ` Martin Jansa
@ 2014-05-08 14:56 ` petter
0 siblings, 0 replies; 24+ messages in thread
From: petter @ 2014-05-08 14:56 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
2014-05-08 12:46 skrev Martin Jansa:
> On Wed, May 07, 2014 at 11:19:50PM +0200, Petter Mabäcker wrote:
>
>> 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.
>
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.
>> Signed-off-by: Petter Mabäcker <petter@technux.se> ---
>> .../{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%) 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
>>
>> 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
>> 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
>>
>
b/meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch
>> 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
>> 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
>>
>
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
>> 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
>> diff --git
>>
>
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
>>
>
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
>> 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
>> diff --git
>>
>
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
>>
>
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
>> 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
>> diff --git
>>
>
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
>>
>
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
>> 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
>> diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
>> b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb index
>> d61097d..291c068 100644 ---
>> a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +++
>> 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 Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]
Links:
------
[1] http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 05/13] xorg-lib: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (3 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 04/13] trace-cmd: remove usage of FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 06/13] mesa: " Petter Mabäcker
` (8 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
meta/recipes-graphics/xorg-lib/libx11.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index e07d42d..6c45828 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
inherit siteinfo
-FILESPATH = "${FILE_DIRNAME}/libx11"
+FILESEXTRAPATHS_prepend := "${THISDIR}/libx11:"
PE = "1"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 06/13] mesa: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (4 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 05/13] xorg-lib: " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-08 10:49 ` Martin Jansa
2014-05-07 21:19 ` [PATCH 07/13] qemu: remove unused FILESPATH Petter Mabäcker
` (7 subsequent siblings)
13 siblings, 1 reply; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
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:"
PROVIDES = "virtual/libgl virtual/mesa"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 06/13] mesa: remove usage of FILESPATH
2014-05-07 21:19 ` [PATCH 06/13] mesa: " Petter Mabäcker
@ 2014-05-08 10:49 ` Martin Jansa
2014-05-09 5:11 ` petter
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2014-05-08 10:49 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]
On Wed, May 07, 2014 at 11:19:52PM +0200, Petter Mabäcker wrote:
> Fixes [YOCTO #4497]
>
> Usage of FILESPATH is discouraged, since it can make recipes harder to
> bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
> 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 <petter@technux.se>
> ---
> 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:"
This was prefering files from mesa-${PV} (when there was version
specific file available) now it doesn't, is it correct?
>
> PROVIDES = "virtual/libgl virtual/mesa"
>
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 06/13] mesa: remove usage of FILESPATH
2014-05-08 10:49 ` Martin Jansa
@ 2014-05-09 5:11 ` petter
0 siblings, 0 replies; 24+ messages in thread
From: petter @ 2014-05-09 5:11 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
2014-05-08 12:49 skrev Martin Jansa:
> On Wed, May 07, 2014 at 11:19:52PM +0200, Petter Mabäcker wrote:
>
>> Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can
>> make recipes harder to bbappend. Instead FILESEXTRAPATHS should be
>> used
>> to extend the path. 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
>> <petter@technux.se> --- 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:"
>
> 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?
>
>> PROVIDES = "virtual/libgl virtual/mesa" -- 1.7.9.5 --
>> _______________________________________________ Openembedded-core
>> mailing list Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]
Links:
------
[1] http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 07/13] qemu: remove unused FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (5 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 06/13] mesa: " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH Petter Mabäcker
` (6 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../qemu/nativesdk-qemu-helper_1.0.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index fe03b82..51d1c59 100644
--- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
+++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (6 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 07/13] qemu: remove unused FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-08 10:50 ` Martin Jansa
2014-05-07 21:19 ` [PATCH 09/13] gcc: " Petter Mabäcker
` (5 subsequent siblings)
13 siblings, 1 reply; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../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
@@ -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 () {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH
2014-05-07 21:19 ` [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH Petter Mabäcker
@ 2014-05-08 10:50 ` Martin Jansa
2014-05-08 14:48 ` petter
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2014-05-08 10:50 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1946 bytes --]
On Wed, May 07, 2014 at 11:19:54PM +0200, Petter Mabäcker wrote:
> Fixes [YOCTO #4497]
>
> Usage of FILESPATH is discouraged, since it can make recipes harder to
> bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
>
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
> .../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
> @@ -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
>
> 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 () {
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH
2014-05-08 10:50 ` Martin Jansa
@ 2014-05-08 14:48 ` petter
0 siblings, 0 replies; 24+ messages in thread
From: petter @ 2014-05-08 14:48 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
2014-05-08 12:50 skrev Martin Jansa:
> On Wed, May 07, 2014 at 11:19:54PM +0200, Petter Mabäcker wrote:
>
>> Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can
>> make recipes harder to bbappend. Instead FILESEXTRAPATHS should be
>> used
>> to extend the path. Signed-off-by: Petter Mabäcker
>> <petter@technux.se>
>> --- .../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
>> @@ -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
Good point, feels like a better way to solve it that way. Will fix this
in v2.
>
>> SRC_URI =
>>
>
> "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz
>> 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 Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core [2]
Links:
------
[1] file://disable_sgml2rtf.patch
[2] http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 09/13] gcc: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (7 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 10/13] python: " Petter Mabäcker
` (4 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
meta/recipes-devtools/gcc/gcc-4.8.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 42b4212..bce9b81 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 10/13] python: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (8 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 09/13] gcc: " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-08 10:53 ` Martin Jansa
2014-05-07 21:19 ` [PATCH 11/13] u-boot: remove unused FILESPATH Petter Mabäcker
` (3 subsequent siblings)
13 siblings, 1 reply; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the
path. Don't migrate paths that already exist in base FILESPATH to
FILESEXTRAPATHS (e.g. BPN, BP and files).
Signed-off-by: Petter Mabäcker <petter@technux.se>
---
.../recipes-devtools/python/python-native_2.7.3.bb | 2 +-
.../python/python-pygobject_2.28.3.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0c66d27..4949546 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -21,7 +21,7 @@ SRC_URI += "\
"
S = "${WORKDIR}/Python-${PV}"
-FILESPATH = "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
inherit native
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 9dbe47c..691666c 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -16,7 +16,7 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
S = "${WORKDIR}/pygobject-${PV}"
-FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
EXTRA_OECONF += "--disable-introspection"
PARALLEL_MAKEINST = ""
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 10/13] python: remove usage of FILESPATH
2014-05-07 21:19 ` [PATCH 10/13] python: " Petter Mabäcker
@ 2014-05-08 10:53 ` Martin Jansa
2014-05-09 4:53 ` petter
0 siblings, 1 reply; 24+ messages in thread
From: Martin Jansa @ 2014-05-08 10:53 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2245 bytes --]
On Wed, May 07, 2014 at 11:19:56PM +0200, Petter Mabäcker wrote:
> Fixes [YOCTO #4497]
>
> Usage of FILESPATH is discouraged, since it can make recipes harder to
> bbappend. Instead FILESEXTRAPATHS should be used to extend the
> path. Don't migrate paths that already exist in base FILESPATH to
> FILESEXTRAPATHS (e.g. BPN, BP and files).
>
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
> .../recipes-devtools/python/python-native_2.7.3.bb | 2 +-
> .../python/python-pygobject_2.28.3.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
> index 0c66d27..4949546 100644
> --- a/meta/recipes-devtools/python/python-native_2.7.3.bb
> +++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
> @@ -21,7 +21,7 @@ SRC_URI += "\
> "
> S = "${WORKDIR}/Python-${PV}"
>
> -FILESPATH = "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> inherit native
>
> diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> index 9dbe47c..691666c 100644
> --- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> +++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
> @@ -16,7 +16,7 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
> SRC_URI[sha256sum] = "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6"
> S = "${WORKDIR}/pygobject-${PV}"
>
> -FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
Is this one correct?
There is
BBCLASSEXTEND = "native"
and prepending python-pygobject-native doesn't seem to be needed.
> EXTRA_OECONF += "--disable-introspection"
>
> PARALLEL_MAKEINST = ""
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 10/13] python: remove usage of FILESPATH
2014-05-08 10:53 ` Martin Jansa
@ 2014-05-09 4:53 ` petter
0 siblings, 0 replies; 24+ messages in thread
From: petter @ 2014-05-09 4:53 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
2014-05-08 12:53 skrev Martin Jansa:
> On Wed, May 07, 2014 at 11:19:56PM +0200, Petter Mabäcker wrote:
>
>> Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can
>> make recipes harder to bbappend. Instead FILESEXTRAPATHS should be
>> used
>> to extend the path. Don't migrate paths that already exist in base
>> FILESPATH to FILESEXTRAPATHS (e.g. BPN, BP and files).
>> Signed-off-by:
>> Petter Mabäcker <petter@technux.se> ---
>> .../recipes-devtools/python/python-native_2.7.3.bb | 2 +-
>> .../python/python-pygobject_2.28.3.bb | 2 +- 2 files changed, 2
>> insertions(+), 2 deletions(-) diff --git
>> a/meta/recipes-devtools/python/python-native_2.7.3.bb
>> b/meta/recipes-devtools/python/python-native_2.7.3.bb index
>> 0c66d27..4949546 100644 ---
>> a/meta/recipes-devtools/python/python-native_2.7.3.bb +++
>> b/meta/recipes-devtools/python/python-native_2.7.3.bb @@ -21,7 +21,7
>> @@
>> SRC_URI += " " S = "${WORKDIR}/Python-${PV}" -FILESPATH =
>> "${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/"
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit native diff
>> --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
>> b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb index
>> 9dbe47c..691666c 100644 ---
>> a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb +++
>> b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb @@ -16,7
>> +16,7 @@ SRC_URI[md5sum] = "aa64900b274c4661a5c32e52922977f9"
>> SRC_URI[sha256sum] =
>> "7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6" S
>> =
>> "${WORKDIR}/pygobject-${PV}" -FILESPATH =
>> "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
>> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> Is this one correct?
>
> There is
> BBCLASSEXTEND = "native"
>
> and prepending python-pygobject-native doesn't seem to be needed.
You're right, this is not needed for pygobject. Will fix this in v2.
>
>> EXTRA_OECONF += "--disable-introspection" PARALLEL_MAKEINST = "" --
>> 1.7.9.5 -- _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]
Links:
------
[1] http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 11/13] u-boot: remove unused FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (9 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 10/13] python: " Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 12/13] uclibc: remove usage of FILESPATH Petter Mabäcker
` (2 subsequent siblings)
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
meta/recipes-bsp/u-boot/u-boot.inc | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index cb50949..d826a40 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -65,7 +65,6 @@ do_install () {
}
FILES_${PN} = "/boot ${sysconfdir}"
-FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
do_deploy () {
install -d ${DEPLOYDIR}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 12/13] uclibc: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (10 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 11/13] u-boot: remove unused FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 21:19 ` [PATCH 13/13] eglibc: " Petter Mabäcker
2014-05-07 22:21 ` [PATCH 00/13] Remove " Richard Purdie
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../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
| 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%)
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch b/meta/recipes-core/uclibc/files/0001-Add-eventfd_read-and-eventfd_write.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch b/meta/recipes-core/uclibc/files/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch b/meta/recipes-core/uclibc/files/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch b/meta/recipes-core/uclibc/files/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch b/meta/recipes-core/uclibc/files/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch b/meta/recipes-core/uclibc/files/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0002-wire-setns-syscall.patch b/meta/recipes-core/uclibc/files/0002-wire-setns-syscall.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch b/meta/recipes-core/uclibc/files/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/0004-Add-clock_adjtime-syscall.patch b/meta/recipes-core/uclibc/files/0004-Add-clock_adjtime-syscall.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/argp-headers.patch b/meta/recipes-core/uclibc/files/argp-headers.patch
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/argp-headers.patch
rename to meta/recipes-core/uclibc/files/argp-headers.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/argp-support.patch b/meta/recipes-core/uclibc/files/argp-support.patch
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/argp-support.patch
rename to meta/recipes-core/uclibc/files/argp-support.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch b/meta/recipes-core/uclibc/files/compile-arm-fork-with-O2.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/locale.cfg b/meta/recipes-core/uclibc/files/locale.cfg
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/locale.cfg
rename to meta/recipes-core/uclibc/files/locale.cfg
diff --git a/meta/recipes-core/uclibc/uclibc-git/obstack.cfg b/meta/recipes-core/uclibc/files/obstack.cfg
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/obstack.cfg
rename to meta/recipes-core/uclibc/files/obstack.cfg
diff --git a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch b/meta/recipes-core/uclibc/files/orign_path.patch
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/orign_path.patch
rename to meta/recipes-core/uclibc/files/orign_path.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch b/meta/recipes-core/uclibc/files/powerpc_copysignl.patch
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch
rename to meta/recipes-core/uclibc/files/powerpc_copysignl.patch
diff --git a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/files/remove_attribute_optimize_Os.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/files/uClibc.distro
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/uClibc.distro
rename to meta/recipes-core/uclibc/files/uClibc.distro
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.machine b/meta/recipes-core/uclibc/files/uClibc.machine
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-git/uClibc.machine
rename to meta/recipes-core/uclibc/files/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc_enable_log2_test.patch b/meta/recipes-core/uclibc/files/uclibc_enable_log2_test.patch
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
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 0649aca..8442269 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 13/13] eglibc: remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (11 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 12/13] uclibc: remove usage of FILESPATH Petter Mabäcker
@ 2014-05-07 21:19 ` Petter Mabäcker
2014-05-07 22:21 ` [PATCH 00/13] Remove " Richard Purdie
13 siblings, 0 replies; 24+ messages in thread
From: Petter Mabäcker @ 2014-05-07 21:19 UTC (permalink / raw)
To: openembedded-core
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 <petter@technux.se>
---
.../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%)
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
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
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
index 3ce0e1d..87b5a6d 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -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=.. \
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 8f09676..1ddce82 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -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
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index d7bc444..5d42572 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 00/13] Remove usage of FILESPATH
2014-05-07 21:19 [PATCH 00/13] Remove usage of FILESPATH Petter Mabäcker
` (12 preceding siblings ...)
2014-05-07 21:19 ` [PATCH 13/13] eglibc: " Petter Mabäcker
@ 2014-05-07 22:21 ` Richard Purdie
2014-05-08 4:37 ` petter
13 siblings, 1 reply; 24+ messages in thread
From: Richard Purdie @ 2014-05-07 22:21 UTC (permalink / raw)
To: Petter Mabäcker; +Cc: openembedded-core
On Wed, 2014-05-07 at 23:19 +0200, Petter Mabäcker wrote:
> 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
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 00/13] Remove usage of FILESPATH
2014-05-07 22:21 ` [PATCH 00/13] Remove " Richard Purdie
@ 2014-05-08 4:37 ` petter
0 siblings, 0 replies; 24+ messages in thread
From: petter @ 2014-05-08 4:37 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
2014-05-08 00:21 skrev Richard Purdie:
> On Wed, 2014-05-07 at 23:19 +0200, Petter Mabäcker wrote:
>
>> 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
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
^ permalink raw reply [flat|nested] 24+ messages in thread