From patchwork Fri May 26 07:00:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2842 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 26 May 2023 09:00:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f183.google.com (mail-qk1-f183.google.com [209.85.222.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70gv1013378 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:42 +0200 Received: by mail-qk1-f183.google.com with SMTP id af79cd13be357-75b67a4f16asf34109685a.1; Fri, 26 May 2023 00:00:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084436; cv=pass; d=google.com; s=arc-20160816; b=rGcrpSihj3WeekacLBMDeZ61B4XxKrJyMyvE4Dbu9fiYbaMZdrZv0NHj3WHl41IqJi yU0XiEQqDnxaYIdT0MFDt/iq4FjtL5IlzD8nnLhYbFIoE7OvykMy7yUqkVVs+rzLlxkb SChsa7I5vVNYFqRJJJvEfD93/EUk3HQ2z/SG17gG/xXfOHLcKNPiB+mb9QoGD4ILC4pg LqRhgjAP8F1FXEEaNEzPl0VjcHnzomaboin158qjaunlYmdZF/UGW83ttPkHqPS8IoY4 2nJ39xnUhll7DhZHd9OQFzi6Yppk10H7p2/w5thxpEpor/waGXmMh/Nn9QHwG/NR/HmZ eaLQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=nkQdJkTt/uLuUngLtHyiEWwwUpQar16+QuubyGAuUXThDgS6prSZ1ZObEW3PJl0t63 8Td+JbeAYuJVObeaLgtg4jGQMhBJW6hclOiELxU0AYhiHKfj6raulndOZBbYF1u9Gggb VyU3S1b4IzYJavKswk9x3MOa8ztiBHuhh1YP8QQIVn7e+O33aLVZzOuqjlzTedZCQaO0 YuOuvDOJFaJOLClAn31qzJdp9SHYnsmjqkmb/CxOvFx4hXICA1DgFI1Hf1X8tVgS+yrV EzcJRE0aHQ/J4oDiMaQVG6ikvlk/+VZsSnrpeX1MMVEfv+W92IiDC//9sJ60YjyCmCg2 D5eA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1685084436; x=1687676436; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=XUT7dgwBwAX64dYMb/XvpYRxu6KP3zuEusserSnuWg4ldfaGyKz/8t/AQBj5jEz8D7 N1v45FgoFKxdh1MbqZbwHwD/wELWpj8lwSplaoqholCFgog27hLhCkRTX/KqUJZN3/MK 0CFQ42bxD3dO8VWIzcIpYo4dBqBUCgEFsW0EfQzG4huCZFDn1Jm4eKAw26ZbA2UcZVZm O0bhoHoGyAX3XUFaIVwsa6dCJ1HU3SD1+m5xCGD5YYj+sva5gYZKjw17iKDI/O6FmbvH xVrmkweupJidcb6Q5y+bbIw1T+TeDZeTkCnt29CV1armsFIk3ObnUNVegjdFjL9c/3MR Hplg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084436; x=1687676436; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=tIfd4IzOTYC6gWXv/obpyZsJZobmRwbFpIxYgWs2CdA=; b=PjBKB7KUMrlmFvBTahApBiIb1SgTrKlPItTwYvUL8tNW+5rTxCHj4ED4uq6TMY7oZ/ cbHlqNYucYPIcZ7Izdw6CrKw6tQc13S44TOwHkrl1/nSg2M9EYYsLPkPn5detjTUjwSm qnRFhGq57UQO0ynAgBBWpoqnQW52Xcw9HeWkPl6N8yzzBlrMpRsYE2sS3vMNqKMrpUvI Vfmfh1waJKmUorGYa8F5GeVk2FJmBn1QLszwbM3CdFC7vlFplOr3Zenwaksc+yV0D9J4 BE6D0dasiDIDiEww9VA6Rz6HQX3FnpBSimEpYaB0omFazNJJl0ApCGY+WmURameSCb8j dkFA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDy5GiXh934GKEk5Bsr6L6Eeldxrk9U+dy+2we5bKjf9vCiPR9vc ULA4i43TbFZ9Grr++qqQV5E= X-Google-Smtp-Source: ACHHUZ4O46f7QSjOj7o6Gfg/WUoFbPI12DSqAtkKC07n/cVb7G45L+wJG1RnsFE9+8vGs20m3bjamQ== X-Received: by 2002:a05:620a:370c:b0:75c:b19b:4fcd with SMTP id de12-20020a05620a370c00b0075cb19b4fcdmr326321qkb.9.1685084436658; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4904:0:b0:3f7:9487:af30 with SMTP id e4-20020ac84904000000b003f79487af30ls2665848qtq.1.-pod-prod-07-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:ac8:5804:0:b0:3f5:1390:9449 with SMTP id g4-20020ac85804000000b003f513909449mr711324qtg.52.1685084436000; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084435; cv=none; d=google.com; s=arc-20160816; b=BUhZuxlYElgIMp+ZTohgXNqZAOac7WIfn0q32saVTpwBHluhLH0mJmcM9rsN9Wtoxq pGuWOLbYbUieCkhxhzggN29JkyNL3m7foNv+MyAoDTMWiEbCQNbdyYDibA7Er/MMXuYX xBD2Zoa8BX9SMuuC+E+sD5o/1R+7grL7oT+cH6FJIBVDBxQFDNAbR7/jkQq4XWbu1Kwl T6Nd992KuS/d/NyrCe4o0yr9r7c6WAFP71whdnU/aFkkRy4Y/C4iawdoZ9m9YjBPG0QW l6KFMGp7kf+8S6OzHE7pgP6cQsSoDbywxC8+o1ywwM25RXdqE9UBgLEMhDvVJnW9FBhv UnMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=Zwa58OX0EU6QtwFfQ5vfYUYl3v0KSEJJqcqiTLJFSZQ=; b=IKh4R1B/php1eZTtXSjWyTLAOkENNK1C+K3A8+OJCDl7tKhucyNz63qpaC1ANMAfQM saAnsOJvZ+YLJgmdrzCCMgLEy6JCQ92nDOL1I7DixozMG9c+vwVXiWi+kNEwm62bpOj/ 0NvOVUDOL29EinLuDI7sd5DRDoQtJ3Zmu7929y9JDTiRopU751jVZ/3osrEKbogP4rIk hGpyadJu6ln6ME5UiS3w9BeiEPwjkj1PfQA5P9faDvyfgIoX7JI+4b8XS6TV4XE7rOVj vWCPPWOVSjktQHj1twpiUGeALmLaKfqRzcIWDzrHZIHWcEC/z1GvSz3JKUdXQbDWXg5h t+Lw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id fx14-20020a05622a4ace00b003f6a957b6b7si336310qtb.4.2023.05.26.00.00.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:35 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34Q70R3Z013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:29 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 05/12] meta: Always use base-apt repo in local mode Date: Fri, 26 May 2023 09:00:20 +0200 Message-Id: <20230526070027.16890-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526070027.16890-1-ubely@ilbers.de> References: <20230526070027.16890-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= This means only local URLs in apt sources.list* are present during the build. Any installation of packages is done from local base-apt. So, base-apt should be always mounted in *_do_mounts since now. Signed-off-by: Uladzimir Bely --- meta/classes/buildchroot.bbclass | 5 +++-- meta/classes/rootfs.bbclass | 5 +++-- .../isar-bootstrap/isar-bootstrap.inc | 12 +++++++---- meta/recipes-devtools/base-apt/base-apt.bb | 21 ++++++++++++------- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index e4a7a571..947529b0 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -38,8 +38,9 @@ buildchroot_do_mounts() { mount --rbind /sys '${BUILDCHROOT_DIR}/sys' mount --make-rslave '${BUILDCHROOT_DIR}/sys' - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] + # Mount base-apt if 'ISAR_PREFETCH_BASE_APT' or 'ISAR_USE_CACHED_BASE_REPO' is set + if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')))}" = 'True' ] || \ + [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] then mkdir -p '${BUILDCHROOT_DIR}/base-apt' mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 22449d71..cedde239 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -54,8 +54,9 @@ rootfs_do_mounts() { mount --bind '${REPO_ISAR_DIR}/${DISTRO}' '${ROOTFSDIR}/isar-apt' fi - # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set - if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] + # Mount base-apt if 'ISAR_PREFETCH_BASE_APT' or 'ISAR_USE_CACHED_BASE_REPO' is set + if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')))}" = 'True' ] || \ + [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ] then mkdir -p '${ROOTFSDIR}/base-apt' mountpoint -q '${ROOTFSDIR}/base-apt' || \ diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b94ae0bd..0cfe82ab 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -42,7 +42,8 @@ python () { # installation afterwards. However, debootstrap will include the key into # the rootfs automatically thus the right place is distro_bootstrap_keys. - if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) or \ + bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) : own_pub_key = d.getVar("BASE_REPO_KEY") if own_pub_key: distro_bootstrap_keys += own_pub_key.split() @@ -110,7 +111,8 @@ def parse_aptsources_list_line(source_list_line): def get_apt_source_mirror(d, aptsources_entry_list): import re - if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) or \ + bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) : premirrors = "\S* file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO}\n" else: premirrors = d.getVar('DISTRO_APT_PREMIRRORS') or "" @@ -286,7 +288,8 @@ do_bootstrap() { if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" fi - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" -a -z "${BASE_REPO_KEY}" ] || \ + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" @@ -313,7 +316,8 @@ do_bootstrap() { install -v -m644 "${APTPREFS}" \ "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + if [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] || \ + [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" if [ -z "${BASE_REPO_KEY}" ]; then line="[trusted=yes] ${line}" diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index ea885fe6..e62958d1 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -57,9 +57,12 @@ repo() { "${BASE_DISTRO_CODENAME}" \ "${WORKDIR}/distributions.in" \ "${KEYFILES}" - populate_base_apt "${BASE_DISTRO}" - repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && \ + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + populate_base_apt "${BASE_DISTRO}" + repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" + fi if [ '${BASE_DISTRO}' != '${HOST_BASE_DISTRO}' ]; then repo_create "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ @@ -67,14 +70,18 @@ repo() { "${BASE_DISTRO_CODENAME}" \ "${WORKDIR}/distributions.in" \ "${KEYFILES}" - populate_base_apt "${HOST_BASE_DISTRO}" - repo_sanity_test "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ - "${REPO_BASE_DB_DIR}"/"${HOST_BASE_DISTRO}" + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && \ + [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then + populate_base_apt "${HOST_BASE_DISTRO}" + repo_sanity_test "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${HOST_BASE_DISTRO}" + fi fi } python do_cache() { - if not bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): + if not bb.utils.to_boolean(d.getVar('ISAR_PREFETCH_BASE_APT')) and \ + not bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): return 0 for key in d.getVar('BASE_REPO_KEY').split():