From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7078983779658760192 X-Received: by 2002:a05:6512:34d0:b0:44a:6d14:5019 with SMTP id w16-20020a05651234d000b0044a6d145019mr3640419lfr.632.1648204351212; Fri, 25 Mar 2022 03:32:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8012:0:b0:249:7cdf:d76 with SMTP id j18-20020a2e8012000000b002497cdf0d76ls1003179ljg.7.gmail; Fri, 25 Mar 2022 03:32:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNIRS2X785dW4ha1kBPkVKdKQ8XHKyJjLNHn6SvuR3ESahw8aqbfQGaLaiQzK1wmUB1TwG X-Received: by 2002:a2e:9c08:0:b0:247:e34f:71c2 with SMTP id s8-20020a2e9c08000000b00247e34f71c2mr7531109lji.392.1648204350049; Fri, 25 Mar 2022 03:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648204350; cv=none; d=google.com; s=arc-20160816; b=nkx46w4WHl5oSNRUkWvJePaGAvugY9VdM0d825pqOFsV3x+0MFyaw/raqtVxzIEuY2 k/UuvtKIHMchE+Llfl0OBZYh1GoxS5zzQRuAFmO8AY9xYH/m/bXw2ZWcopBuRCKQ0pre y6+zY8CWoppT/TDyoHJK6ZqF1v1sUBTlawfZ1Y9fFHjZ4UcEbjwMbIPsWb1yTB5Gaf+N IwjXE6B1J7EWZTLKeatqR3oAPa31MnjedZjJwnXLf2xpT9+N8GrwItX31N9GTP828CUo 1r268MxCneDoAYMsSSH+cMp0ruDsIozlbD7Ca7QJQFQBCTFJiAiy8/2jrlki7P5Apy19 1F8A== 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=p1fXc8/QRmg6eAFlfnYS4YBC8QLVVWtwOUTrsQ/dEK4=; b=BOUGMMLimUD1Ph1KJeTB7ifrpQ05WxQLdfGhG6Gn2Odz/VcDDbn/yBYMVrkDaSbcqP 6Klj4S5giYXXW3Lu1mlQtX65vWtTw+Wk0b91PVlES4o4q3eHgg4pbZrxlyhHOdyCzRnk +FQstrLBBmbbljI43Stq3rN9m5UC2YGgXDs2/XVXZvWLvYNYBc6+s8E6gifAYkNda7yq pKql4wda4qPM7wwI+692cLdsSN99Qw6GUW5CXsD78S8DoGvST41Yns8srY+fDuIJiLx+ 0BdGVxU5yR8+pCkBSWm/zppD0zlzts9aMN4O4dKDGBlc26u9eQyKDTwV1Kbdvf2wImW9 wMOw== 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 z19-20020a195e53000000b0044a11f487a1si302439lfi.11.2022.03.25.03.32.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Mar 2022 03:32:30 -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; 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) with ESMTPSA id 22PAWQZZ030611 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 25 Mar 2022 11:32:29 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 3/5] meta: always use base-apt repo in local mode Date: Fri, 25 Mar 2022 11:32:24 +0100 Message-Id: <20220325103226.27033-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220325103226.27033-1-ubely@ilbers.de> References: <20220325103226.27033-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: rfgYyZV5DjDf This means that only local URLs in apt sources.list* is 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 | 24 ++++++++----------- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index dd8f4206..23e78c24 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 ba86c60a..54d1f714 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -52,13 +52,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 24925dbb..545bd474 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -341,20 +341,16 @@ 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/${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" - 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 - else - install -v -m644 "${APTSRCS}" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - fi + + line="file:///base-apt/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" + [ -z "${BASE_REPO_KEY}" ] && line="[trusted=yes] ${line}" + + echo "deb ${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 + install -v -m644 "${APTSRCS_INIT}" "${ROOTFSDIR}/etc/apt/sources-list" rm -f "${ROOTFSDIR}/etc/apt/sources.list" rm -rf "${ROOTFSDIR}/var/lib/apt/lists/"* -- 2.20.1