Re: [PATCHv3 8/9] bootstrap: fix debootstrap gpg issue when base-apt is not signed

[Jan Kiszka <jan.kiszka@siemens.com>]

On 07.11.19 19:56, Henning Schild wrote:
> From: Henning Schild <henning.schild@siemens.com>
> 
> DISTRO_BOOTSTRAP_KEYRING will not exist if DISTRO_BOOTSTRAP_KEYFILES is empty.
> So the debootstrap argument will not work.
> Simplify the logic to depend on the existance of the keyring-file.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++-------
>   1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index 203a557..b506f30 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -231,14 +231,10 @@ isar_bootstrap() {
>           shift
>       done
>       debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}"
> -    if [ ! "x${DISTRO_BOOTSTRAP_KEYS}" = "x" ] || \
> -       [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
> +    if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then
>           debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}"
> -    fi
> -    if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
> -        if [ -z "${BASE_REPO_KEY}" ] ; then
> -            debootstrap_args="$debootstrap_args --no-check-gpg"
> -        fi
> +    else
> +        debootstrap_args="$debootstrap_args --no-check-gpg"
>       fi
>       E="${@ isar_export_proxies(d)}"
>       export IS_HOST debootstrap_args E
> 

Breaks with non-empty DISTRO_BOOTSTRAP_KEYS and a non-signed base-apt.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux