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

login
register
mail settings
Submitter Petter Mabäcker
Date May 7, 2014, 9:19 p.m.
Message ID <699098e9da6b5932cce137031ad8dc3604d949a3.1399497346.git.petter@technux.se>
Download mbox | patch
Permalink /patch/71731/
State New
Headers show

Comments

Petter Mabäcker - May 7, 2014, 9:19 p.m.
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%)
Martin Jansa - May 8, 2014, 10:46 a.m.
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
Petter Mabäcker - May 8, 2014, 2:56 p.m.
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

Patch

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