Re: [PATCH 2/2] improve cachability of isar-bootstrap

[Anton Mikanovich <amikan@ilbers.de>]

09.08.2022 17:07, Felix Moessbauer wrote:
> This patch makes all paths used in the bootstrapping relative
> to TOPDIR to be able to cache the isar-bootstrap task.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>   meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index 604cd24c..9f512032 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -35,8 +35,8 @@ inherit deb-dl-dir
>   
>   python () {
>       distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split()
> -
>       third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split()
> +    topdir = d.getVar("TOPDIR", True)
>   
>       # The cached repo key can be both for bootstrapping and apt package
>       # installation afterwards. However, debootstrap will include the key into
> @@ -50,14 +50,14 @@ python () {
>       for key in distro_bootstrap_keys:
>           d.appendVar("SRC_URI", " %s" % key)
>           fetcher = bb.fetch2.Fetch([key], d)
> -        filename = fetcher.localpath(key)
> -        d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", " %s" % filename)
> +        filename = os.path.relpath(fetcher.localpath(key), topdir)
> +        d.appendVar("DISTRO_BOOTSTRAP_KEYFILES", "${TOPDIR}/%s" % filename)
>   
>       for key in third_party_apt_keys:
>           d.appendVar("SRC_URI", " %s" % key)
>           fetcher = bb.fetch2.Fetch([key], d)
> -        filename = fetcher.localpath(key)
> -        d.appendVar("THIRD_PARTY_APT_KEYFILES", " %s" % filename)
> +        filename = os.path.relpath(fetcher.localpath(key), topdir)
> +        d.appendVar("THIRD_PARTY_APT_KEYFILES", " ${TOPDIR}/%s" % filename)
>   
>       distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or ""
>       for file in distro_apt_sources.split():

Hello Felix,

This patch brakes keys management in some cases:

$ bitbake -c do_generate_keyrings 
mc:qemuriscv64-sid-ports:isar-bootstrap-target
...
| gpg: can't open 
'/home/amikan/isar/build/../../downloads/archive_2022.key/home/amikan/isar/build/../../downloads/archive_2023.key': 
Not a directory

There can be more then one keyfile just like qemuriscv64 has.

P.S. qemuriscv64-sid-ports target is not fully buildable currently even 
on the
latest next, we are working on it already.