From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469237672542208 X-Received: by 2002:a05:6e02:521:b0:2ff:dc4b:a4b8 with SMTP id h1-20020a056e02052100b002ffdc4ba4b8mr8837547ils.222.1669272137115; Wed, 23 Nov 2022 22:42:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1208:b0:2ff:911e:c385 with SMTP id a8-20020a056e02120800b002ff911ec385ls165812ilq.4.-pod-prod-gmail; Wed, 23 Nov 2022 22:42:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6uUa2YqG+2OAknQPHwPZoRY7t75LDXonkVMrECnR3gr7GqNipQKIG94dfuvFJTtiVPXY0w X-Received: by 2002:a92:c268:0:b0:302:a938:81be with SMTP id h8-20020a92c268000000b00302a93881bemr5437441ild.84.1669272136359; Wed, 23 Nov 2022 22:42:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669272136; cv=none; d=google.com; s=arc-20160816; b=mnyXvpMNXSrun5pVUnYnIUdU0tNid0JYMQn7lEOKEj+G97kLdcDeXI6WKsDSKXmUGX m5/9rGbrx41gBK49ZorkXBeM9fLQdazHlKKKxyhXcapRNe2f2/wGwVgAN+9V3X0H4Lk4 Ch0PxDctJyfdgeOa4Icd6war6UCRRjD/qDXF05XVl2SoABpNPhOC1Locis1eF8tcjr1s okKgSVoEn7TnEXqobc9K49DeUty6Mp2tV/JQ35vEtgEgF5BxT9o4KbrzUxmW7qPlAV5q mqPLD2vW8hzuBguv5uknCq71hg0yB1jGhQwguU7cLGwhHSdn2DJcjLAKhJLpoJh5XtVT 6Tjw== 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=crSTZX7uoIV9/RosVIkL0czA1mUqk9pctkPGCsk1GZk=; b=JGQVkMa+L8my3Iq7vWtN7luDJ8go6OzZYoM4z8MN8av0xcpjoHPKYcjq3kg1Fyff0N sG5lEgQ01X2+0FSa/9KZCFbcYSkaeikuOklstFyXiaKsY/PYjJFwmnaLN5KIp84pdMti 6wNtutziAS+IOFIfojgtPEK3Jrw31C7o2/A/X2nxls7+uJhQgvVxKXt/MXA2jWFW2gKF UWRRJGcrp9MGixYRqdYiKLXAQ9MoKrBEl+PzavtBoiD90CfGkJXeqKvn3bcmiZwaV19/ uZuMCI4LlfEU4I5UWSQAueH/k6gzDO74swUfQUaD5MOezBqRiZALkuJLnEd+CgGgzafi zyGg== 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 b24-20020a056602001800b00684c9b5bc7asi18566ioa.1.2022.11.23.22.42.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Nov 2022 22:42:16 -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 2AO6gDip009980 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 24 Nov 2022 07:42:14 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 1/2] Populate base-apt from both DISTRO and HOST_DISTRO download dirs Date: Thu, 24 Nov 2022 07:42:12 +0100 Message-Id: <20221124064213.22283-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221124064213.22283-1-ubely@ilbers.de> References: <20221124064213.22283-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: mUUAjmhiHgh8 Downstreams may want to change DISTRO to some custom value. When cross-building, this leads to downloading packages for host and target distros to the different download subdirs. While base-apt is populated only from DISTRO download subdir, second cached (ISAR_USE_CACHED_BASE_REPO = "1") build fails due to missing packages in base-apt. Fix it here by populating base-apt from both download subdirs. Signed-off-by: Uladzimir Bely --- meta/recipes-devtools/base-apt/base-apt.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 506a28ff..e0d47625 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -13,7 +13,9 @@ KEYFILES ?= "" BASE_REPO_FEATURES ?= "" populate_base_apt() { - find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do + distro="${1}" + + find "${DEBDIR}"/"${distro}" -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 @@ -38,7 +40,7 @@ populate_base_apt() { "${package}" done - find "${DEBSRCDIR}"/"${DISTRO}" -name '*\.dsc' | while read package; do + find "${DEBSRCDIR}"/"${distro}" -name '*\.dsc' | while read package; do repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ "${BASE_DISTRO_CODENAME}" \ @@ -66,7 +68,10 @@ repo() { "Try it without cross-build." fi - populate_base_apt + populate_base_apt "${DISTRO}" + if [ '${DISTRO}' != '${HOST_DISTRO}' ]; then + populate_base_apt "${HOST_DISTRO}" + fi repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" } -- 2.20.1