From ed1c156cf46c2cdd8038d6bcf7ed58ebe275e3a1 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Fri, 15 Jan 2021 15:59:51 +0000 Subject: staging: Introduce /sysroot-only to SYSROOT_DIRS The '/sysroot-only' in SYSROOT_DIRS is to be used by recipes which generate artifacts that are not included in the target filesystem. Also, remove the ${D}/sysroot-only dir before copying D do PKGD to generate the packages since it is not supposed to be included in any package. This will allow recipes to share non-target filesystem artifacts without needing to use the DEPLOY_DIR and keep it tidy. Signed-off-by: Diego Sueiro Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 ++++++ meta/classes/staging.bbclass | 1 + 2 files changed, 7 insertions(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 247bdc7bbf..a77d532b66 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -807,10 +807,16 @@ python package_do_split_locales() { python perform_packagecopy () { import subprocess + import shutil dest = d.getVar('D') dvar = d.getVar('PKGD') + # Remove ${D}/sysroot-only if present + sysroot_only = os.path.join(dest, 'sysroot-only') + if cpath.exists(sysroot_only) and cpath.isdir(sysroot_only): + shutil.rmtree(sysroot_only) + # Start by package population by taking a copy of the installed # files to operate on # Preserve sparse files and hard links diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index f0a619b35b..12e0eab4f0 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -5,6 +5,7 @@ SYSROOT_DIRS = " \ ${base_libdir} \ ${nonarch_base_libdir} \ ${datadir} \ + /sysroot-only \ " # These directories are also staged in the sysroot when they contain files that -- cgit 1.2.3-korg