From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7202866696458076160 X-Received: by 2002:a5b:5cf:0:b0:7be:e39b:cd7f with SMTP id w15-20020a5b05cf000000b007bee39bcd7fmr1104454ybp.417.1677048091177; Tue, 21 Feb 2023 22:41:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:2fcf:0:b0:8dc:e5aa:b62 with SMTP id v198-20020a252fcf000000b008dce5aa0b62ls3362701ybv.5.-pod-prod-gmail; Tue, 21 Feb 2023 22:41:30 -0800 (PST) X-Google-Smtp-Source: AK7set8ov4d8nGrTwGB4bxRpyfhoIHFRfdiK3XZG3NGCqb719DuODRYBwDvUhbAi8fVBT3UK1d32 X-Received: by 2002:a5b:60d:0:b0:94a:ebba:cbb1 with SMTP id d13-20020a5b060d000000b0094aebbacbb1mr5590957ybq.19.1677048090380; Tue, 21 Feb 2023 22:41:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677048090; cv=none; d=google.com; s=arc-20160816; b=OyBDE/7pbBWNSBnCLT6kWEO5onXwFYcm7LKAyPjTgyWBM6DBKOynwMlozfP9GDUqZf 9J8+HkOqLw1j8MWtHVPObQgKRLxSvkJwlLsdQkQzQCJww6hprbvKxg4uWz23MKslYD3R qu6JMqKrZkBjN20zcuPaAyi2TJg2j4bBtTp2QSdrxzw5uoibsVWNoIwbIxy0fWbqeIt0 VPxewDMlN+LgiStkLSE7w9kz2C3y186Y+gjd/HUvtT/V6823nasaLnJQkjNYknhbm1Ob AnZlEWRMnrJs2Xdguog3MAUW4dD/umGF+ShhrMNGghnBkdtIen4hNZWupl0Fns+SHLxA FkMQ== 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=LXCQj9Jl89oTUJLWGIZgS4BE/6QgmvY+jAXIUWDhS5w=; b=j6QWvMiOQyGZCSDXvU1vQhY78tLLAjdBiKNd4U9SGyU76fskJ3Oeb/dZp5QZg+voYb v7lu7CWUjhN0423cVsBtQd2Ogou1DRbiosOwMGuhmLcSQO2+9qvBy6qCcjLVkCSMXNYJ GXrVsrqOWdXI2yc4xI9r1IPl82NXGlER6RJXo4iUW/yErM0bFynMncWJnvbqtik/K4le seLz1R8GXYg7tEGUNdIgpJ8J8hufQ/7LBsP198CehmRe37/NNRYud95fyMg34XKNVxG4 GGnI2jEmBReaEbNbiIxM4OSBaMfM+1Wuifz+piHmcdHCYivjicrf7JSyZukyesbkLbHD +gPA== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k188-20020a2524c5000000b0090621221d35si589045ybk.2.2023.02.21.22.41.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 22:41:30 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; 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 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 31M6fPc8011872 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Feb 2023 07:41:28 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 04/13] meta: Always use base-apt repo in local mode Date: Wed, 22 Feb 2023 07:41:16 +0100 Message-Id: <20230222064125.22754-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230222064125.22754-1-ubely@ilbers.de> References: <20230222064125.22754-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: F5rRCimMKQFq 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 | 10 ++-- meta/classes/rootfs.bbclass | 10 ++-- .../isar-bootstrap/isar-bootstrap.inc | 32 ++++++------- meta/recipes-devtools/base-apt/base-apt.bb | 46 ------------------- 4 files changed, 20 insertions(+), 78 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 5abd533b..22a03d45 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -50,13 +50,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' ] - then - mkdir -p '${BUILDCHROOT_DIR}/base-apt' - mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ - mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' - fi + mkdir -p '${BUILDCHROOT_DIR}/base-apt' + mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \ + mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt' # Refresh or remove /etc/resolv.conf at this chance if [ "${@repr(bb.utils.to_boolean(d.getVar('BB_NO_NETWORK')))}" = 'True' ] diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 0eed3d02..92d665db 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -54,13 +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' ] - then - mkdir -p '${ROOTFSDIR}/base-apt' - mountpoint -q '${ROOTFSDIR}/base-apt' || \ - mount --bind '${REPO_BASE_DIR}' '${ROOTFSDIR}/base-apt' - fi + mkdir -p '${ROOTFSDIR}/base-apt' + mountpoint -q '${ROOTFSDIR}/base-apt' || \ + mount --bind '${REPO_BASE_DIR}' '${ROOTFSDIR}/base-apt' EOSUDO } diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 99d75e21..01668b93 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -42,10 +42,9 @@ 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')): - own_pub_key = d.getVar("BASE_REPO_KEY") - if own_pub_key: - distro_bootstrap_keys += own_pub_key.split() + own_pub_key = d.getVar("BASE_REPO_KEY") + if own_pub_key: + distro_bootstrap_keys += own_pub_key.split() for key in distro_bootstrap_keys: d.appendVar("SRC_URI", " %s" % key) @@ -284,7 +283,7 @@ 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 [ -z "${BASE_REPO_KEY}" ]; then debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" @@ -311,24 +310,21 @@ 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 - line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" - if [ -z "${BASE_REPO_KEY}" ]; then - line="[trusted=yes] ${line}" - fi - echo "deb ${line}" > "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + + line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" + if [ -z "${BASE_REPO_KEY}" ]; then + line="[trusted=yes] ${line}" + fi + echo "deb ${line}" > "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" line="file:///base-apt/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" if [ -z "${BASE_REPO_KEY}" ]; then line="[trusted=yes] ${line}" fi - echo "deb-src ${line}" >> "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + echo "deb-src ${line}" >> "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + + mkdir -p ${ROOTFSDIR}/base-apt + mount --bind ${REPO_BASE_DIR} ${ROOTFSDIR}/base-apt - mkdir -p ${ROOTFSDIR}/base-apt - mount --bind ${REPO_BASE_DIR} ${ROOTFSDIR}/base-apt - else - install -v -m644 "${APTSRCS}" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - fi install -v -m644 "${APTSRCS_INIT}" "${ROOTFSDIR}/etc/apt/sources-list" rm -f "${ROOTFSDIR}/etc/apt/sources.list" rm -rf "${ROOTFSDIR}/var/lib/apt/lists/"* diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index ea885fe6..d5b3cf4e 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -10,43 +10,6 @@ SRC_URI = "file://distributions.in" BASE_REPO_KEY ?= "" KEYFILES ?= "" -BASE_REPO_FEATURES ?= "" - -populate_base_apt() { - base_distro="${1}" - - find "${DEBDIR}"/"${base_distro}-${BASE_DISTRO_CODENAME}" -name '*\.deb' | while read package; do - # NOTE: due to packages stored by reprepro are not modified, we can - # use search by filename to check if package is already in repo. In - # addition, md5sums are compared to ensure that the package is the - # same and should not be overwritten. This method is easier and more - # robust than querying reprepro by name. - - # Check if this package is already in base-apt - ret=0 - repo_contains_package "${REPO_BASE_DIR}/${base_distro}" "${package}" || - ret=$? - [ "${ret}" = "0" ] && continue - if [ "${ret}" = "1" ]; then - repo_del_package "${REPO_BASE_DIR}"/"${base_distro}" \ - "${REPO_BASE_DB_DIR}"/"${base_distro}" \ - "${BASE_DISTRO_CODENAME}" \ - "${package}" - fi - - repo_add_packages "${REPO_BASE_DIR}"/"${base_distro}" \ - "${REPO_BASE_DB_DIR}"/"${base_distro}" \ - "${BASE_DISTRO_CODENAME}" \ - "${package}" - done - - find "${DEBSRCDIR}"/"${base_distro}-${BASE_DISTRO_CODENAME}" -name '*\.dsc' | while read package; do - repo_add_srcpackage "${REPO_BASE_DIR}"/"${base_distro}" \ - "${REPO_BASE_DB_DIR}"/"${base_distro}" \ - "${BASE_DISTRO_CODENAME}" \ - "${package}" - done -} do_cache[stamp-extra-info] = "${DISTRO}" do_cache[lockfiles] = "${REPO_BASE_DIR}/isar.lock" @@ -57,9 +20,6 @@ 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 [ '${BASE_DISTRO}' != '${HOST_BASE_DISTRO}' ]; then repo_create "${REPO_BASE_DIR}"/"${HOST_BASE_DISTRO}" \ @@ -67,16 +27,10 @@ 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}" fi } python do_cache() { - if not bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): - return 0 - for key in d.getVar('BASE_REPO_KEY').split(): d.appendVar("SRC_URI", " %s" % key) fetcher = bb.fetch2.Fetch([key], d) -- 2.20.1