Patchwork [00/13] Remove usage of FILESPATH

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

Pull-request

git://git.yoctoproject.org/poky-contrib petmab/bug/4497

Comments

Petter Mabäcker - May 7, 2014, 9:19 p.m.
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%)
Richard Purdie - May 7, 2014, 10:21 p.m.
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
Petter Mabäcker - May 8, 2014, 4:37 a.m.
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