From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6723121859881074688 X-Received: by 2002:adf:fc8d:: with SMTP id g13mr22313304wrr.234.1565348789306; Fri, 09 Aug 2019 04:06:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ec43:: with SMTP id w3ls1571187wrn.14.gmail; Fri, 09 Aug 2019 04:06:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCrilmwmmpWle253EJV/13zvx12d5IwC6JewLDxFAzEAiWoz7jtKL96mKgNIVORu37wFvP X-Received: by 2002:adf:dbce:: with SMTP id e14mr14098992wrj.9.1565348788810; Fri, 09 Aug 2019 04:06:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565348788; cv=none; d=google.com; s=arc-20160816; b=qaLd04LPTdcxmpvSKWyyBz0pTHi04sw7MNR1DsxYAVEf1O0jlOCPB5ix2FkJMkGEV+ 2uZAE83i7/qmgIGSF/mpUYSyBQSNtaHK7iK7XhDSaomRAAG5LgK3gFk1NnDFUzGCMhND tTibJBELBFEKUsMsiojkwaMZShQgRtjQyyjU5Ihlqo2rfHXClyoY/mMz0CsP3a+SFRfJ 6SaqIuLYqruYLy7hgD0ywjSTGvtNoJ0tb7lBDQaoE+POrr6sjVF5v8phfXmqDgCnUKOD EuSES/TRZA7PIjcTltxafbEBw79J5uPOLKSutq9MZixV/I2IMd8qBvYczMOFap1sjzf+ xvVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=vMNL1pCSKd+6irr3hkaTYDGLVkhqJ1d7KgJMBe/QSxA=; b=Q5ZZlSUrUf5lOjEf0QkgujgxtbU5NCLof6+yw6WoigPHK+63gFxhwdMiXLWY18IoKg 1k+ZQFoU9Eojm5lbbYMo+N6qa7mdQxxQGDuPAh38UxzC2jtHjNZ0soKhm751lqSKz/28 MPG4BkIng4IzOEcN8PzsqaZFgikYBjYQYo9UdDb1pkKYLAikLMcAmCufN6Setp3cBch0 GZTxoXog9pSR0SKdziPMrufBtHjYk6BLu/GS62kV+9HN6OZe9bqYOSUxLPKNqIqZ5DLJ YY4ye8QxIdGbc8HC4+JrGNBGlwor/RWXHY/rX2ZriuZeEaiS/X17M3DDNe5Ah7vR/wTw d0dA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id r13si4951716wrn.3.2019.08.09.04.06.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 04:06:28 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x79B6RcC008209 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 9 Aug 2019 13:06:28 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x79B6RKW021358; Fri, 9 Aug 2019 13:06:27 +0200 To: isar-users Cc: Claudius Heine From: Jan Kiszka Subject: [PATCH] isar-bootstrap-host: Introduce HOST_DISTRO_BOOTSTRAP_KEYS Message-ID: <717de8f8-c3f1-91da-918c-02baf86aa4df@siemens.com> Date: Fri, 9 Aug 2019 13:06:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: ZNva21qBtxjd From: Jan Kiszka Analogously to DISTRO_BOOTSTRAP_KEYS, this allows to override the key used for bootstrapping the host distro. This is required when using custom repos e.g. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 1 + meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index ed181aa..289fd1d 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -318,6 +318,7 @@ Some other variables include: - `HOST_ARCH` - The Debian architecture of SDK root filesystem (e.g., `amd64`). By default set to current Debian host architecture. This variable is optional. - `HOST_DISTRO_APT_SOURCES` - List of apt source files for SDK root filesystem. This variable is optional. - `HOST_DISTRO_APT_PREFERENCES` - List of apt preference files for SDK root filesystem. This variable is optional. + - `HOST_DISTRO_BOOTSTRAP_KEYS` - Analogously to DISTRO_BOOTSTRAP_KEYS: List of gpg key URIs used to verify apt bootstrap repo for the host. - `DISTRO_APT_PREMIRRORS` - The preferred mirror (append it to the default URI in the format `ftp.debian.org my.preferred.mirror`. This variable is optional. - `THIRD_PARTY_APT_KEYS` - List of gpg key URIs used to verify apt repos for apt installation after bootstrapping diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index ee8f362..8363465 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -12,8 +12,9 @@ DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${D ISAR_BOOTSTRAP_LOCK = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}.lock" require isar-bootstrap.inc -# We only build debian host buildchroot environments -DISTRO_BOOTSTRAP_KEYS = "" + +HOST_DISTRO_BOOTSTRAP_KEYS ?= "" +DISTRO_BOOTSTRAP_KEYS = "${HOST_DISTRO_BOOTSTRAP_KEYS}" do_apt_config_prepare[dirs] = "${WORKDIR}" do_apt_config_prepare[vardeps] += "\ -- 2.16.4