Skip to content

Simplify how to stage directories in the sysroot

Peter Kjellerstedt openembedded-core 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest16 patches 6 repliesIn review
  2. v116 patches 2 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16staging.bbclass: Make it easier to define which dirs to stagemeta/classes/staging.bbclass+42 -330 replies
2/16u-boot-fw-utils: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb+1 -40 replies
3/16libtool-cross: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-devtools/libtool/libtool-cross_2.4.6.bb+1 -60 replies
4/16qemuwrapper-cross: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb+1 -50 replies
5/16tcl: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-devtools/tcltk/tcl_8.6.4.bb+1 -46 replies
6/16shadow-sysroot: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb+2 -40 replies
7/16depmodwrapper-cross: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb+1 -50 replies
8/16base-files: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-core/base-files/base-files_3.0.14.bb+1 -40 replies
9/16signing-keys: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-core/meta/signing-keys.bb+2 -40 replies
10/16vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-devtools/vala/vala.inc+6 -70 replies
11/16gobject-introspection: Use SYSROOT_DIRS to add dirs to stage in sysrootmeta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb+4 -50 replies
12/16grub2.inc: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysrootmeta/recipes-bsp/grub/grub2.inc+1 -40 replies
13/16gettext: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysrootmeta/recipes-core/gettext/gettext_0.16.1.bb+1 -60 replies
14/16gcc-target.inc: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from sysrootmeta/recipes-devtools/gcc/gcc-target.inc+1 -30 replies
15/16libtool: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysrootmeta/recipes-devtools/libtool/libtool_2.4.6.bb+5 -80 replies
16/16font-util: Remove ${datadir}/fonts from SYSROOT_DIRS_BLACKLISTmeta/recipes-graphics/xorg-font/font-util_1.3.1.bb+1 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCHv2 00/16] Simplify how to stage directories in the sysroot

The first commit in this set makes it possible to specify the directories that will be staged in the sysroot via variables rather than hardcoding it in sysroot_stage_dirs(). This should make it a lot easier to add/remove directories to stage.

The rest of the commits just change recipes to take advantage of the new variables.

Because of the following if statement in sysroot_stage_dirs():

	if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then

I have split the list of directories into SYSROOT_DIRS and SYSROOT_DIRS_NATIVE, where the latter is included if that if statement is true. I am not sure when that statement is true (my understanding is that it should be true for native builds, but I am not sure if it is also true for other builds like cross, nativesdk, etc). If it is only true for native builds then that if statement could be removed, and the SYSROOT_DIRS_NATIVE variable could be replaced by SYSROOT_DIRS_append_class-native...

PATCHv2: Removed the if statement mentioned above and replaced it with normal _append operations on SYSROOT_DIRS instead.

//Peter

The following changes since commit 28433319ad8299aa23b1fcfdddbe100b29e86517:

bitbake: toaster: tests browser Add test for creating a project (2016-05-11 11:32:58 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib pkj/sysroot_dirs
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/sysroot_dirs

Peter Kjellerstedt (16):
staging.bbclass: Make it easier to define which dirs to stage
u-boot-fw-utils: Use SYSROOT_DIRS to add dirs to stage in sysroot
libtool-cross: Use SYSROOT_DIRS to add dirs to stage in sysroot
qemuwrapper-cross: Use SYSROOT_DIRS to add dirs to stage in sysroot
tcl: Use SYSROOT_DIRS to add dirs to stage in sysroot
shadow-sysroot: Use SYSROOT_DIRS to add dirs to stage in sysroot
depmodwrapper-cross: Use SYSROOT_DIRS to add dirs to stage in sysroot
base-files: Use SYSROOT_DIRS to add dirs to stage in sysroot
signing-keys: Use SYSROOT_DIRS to add dirs to stage in sysroot vala.inc: Use SYSROOT_DIRS to add dirs to stage in sysroot
gobject-introspection: Use SYSROOT_DIRS to add dirs to stage in
sysroot
grub2.inc: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysroot
gettext: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysroot gcc-target.inc: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from
sysroot
libtool: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysroot
font-util: Remove ${datadir}/fonts from SYSROOT_DIRS_BLACKLIST

 meta/classes/staging.bbclass                       | 75 ++++++++++++----------
 meta/recipes-bsp/grub/grub2.inc                    |  5 +-
 meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb |  5 +-
 meta/recipes-core/base-files/base-files_3.0.14.bb  |  5 +-
 meta/recipes-core/gettext/gettext_0.16.1.bb        |  7 +-
 meta/recipes-core/meta/signing-keys.bb             |  6 +-
 meta/recipes-devtools/gcc/gcc-target.inc           |  4 +-
 .../libtool/libtool-cross_2.4.6.bb                 |  7 +-
 meta/recipes-devtools/libtool/libtool_2.4.6.bb     | 13 ++--
 .../recipes-devtools/qemu/qemuwrapper-cross_1.0.bb |  6 +-
 meta/recipes-devtools/tcltk/tcl_8.6.4.bb           |  5 +-
 meta/recipes-devtools/vala/vala.inc                | 13 ++--
 .../shadow/shadow-sysroot_4.2.1.bb                 |  6 +-
 .../gobject-introspection_1.46.0.bb                |  9 ++-
 meta/recipes-graphics/xorg-font/font-util_1.3.1.bb |  5 +-
 .../recipes-kernel/kmod/depmodwrapper-cross_1.0.bb |  6 +-
 16 files changed, 71 insertions(+), 106 deletions(-)
Signature · 1 line
2.1.0