From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7277453468658302976 X-Received: by 2002:a2e:9606:0:b0:2bd:e3e:1a23 with SMTP id v6-20020a2e9606000000b002bd0e3e1a23mr6369657ljh.45.1694414175787; Sun, 10 Sep 2023 23:36:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:548:b0:2be:574a:3b21 with SMTP id q8-20020a05651c054800b002be574a3b21ls1756931ljp.1.-pod-prod-09-eu; Sun, 10 Sep 2023 23:36:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGjSqY+YjfcHEZKfC1axe2ynEn6NBFzTxvH7k0WB77onZcD+Iv+pypkkkaSNSB7VRWLne8 X-Received: by 2002:a05:651c:88:b0:2bc:cff6:f506 with SMTP id 8-20020a05651c008800b002bccff6f506mr6743367ljq.0.1694414173420; Sun, 10 Sep 2023 23:36:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694414173; cv=none; d=google.com; s=arc-20160816; b=sMfo2v5Q3Irn9ly/I8Q+8X8WTlE3BU/kneZht3/Hsi5420WNzRjRWOvhJeR8dKvs32 Gtn7OxQoYmykb2JnQf+wctz3/Y+BWehB60EYmrDu2LoH5VNo6uSS6/e93E0aW2jJcbBy vZ8xYKEAEHkCmi3JcHQys8yzWnAxtuOnKp9jBEXGfROHnMy6F4dSxXwPoTN5m65JesHn 2HUwMLyWCBhCBGWynJMdyZcKOo5RO+K8CQ8FnXP+lCEUqEmrpG0n7oWCZtECvA+Ul9FU pO0KFD2h3sLHoENZqRBfrUTVAvKwSDYUqpP7k8eb6oeBQ9zRrUOVXL8HTsTfYoMUD0ZH Brfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=0gVHENu4Jz7heQ1JdkmaIlvYMrg7kASIcTLGg4grKiM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Kq3Jba+bQex3SaEe7Q6J+nuBr0jocRIZihW8ZMmkCuXbGfNkcT26vEDBcerR5AIFWR 4iYYMqqkKNT4VrNTsazGMIDsdn8l8iKC0B2tj+jYWnaypk2juq6tN872K4wgjE3YyRtz VcgnbFBS7CqBW6Z2Y2xWO+reJZ8gwEzZKUmR+u/kaLjU0GEFrnIQ9c6hvtSf84AwwNdy gpMxTWjW5SY0CFPypjl5CTdwrzCPsvIXUdm0NA413KsXxqFxg1IHKLjVYthCyjbkDows 5SBOdzpP1EPrQ2FomTcRL6OaY5KG03Q+e7TlqmMuHTImDliZC/PAQYk3SZywdiLbxLKT Kx1g== 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 w13-20020a05651c102d00b002bcc064ac3asi471615ljm.7.2023.09.10.23.36.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Sep 2023 23:36:13 -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+deb9u1) with ESMTPSA id 38B6aBE6003874 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2023 08:36:12 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] dpkg: Fix internal deb import for sbuild Date: Mon, 11 Sep 2023 08:36:11 +0200 Message-Id: <20230911063611.13703-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: M8oQI77ucxZK Directory "/var/cache/apt/archives" may not exist under sbuild env (for example, when sbuild chroot was taken from sstate-cache), so deb import doesn't properly work in this case. This makes apt download packages from external mirror instead of using cached files. Also, stop masking (with "|| :" any possible errors while importing and exporting *.deb files to/from sbuild environment. --- meta/classes/dpkg.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c596adbf..3acdcb31 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -109,9 +109,10 @@ dpkg_runbuild() { --chroot-setup-commands="echo \"Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt" \ --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ - --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/ || :" \ + --chroot-setup-commands="mkdir -p ${deb_dir}" \ + --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ - --finished-build-commands="cp -Ln --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ + --finished-build-commands="cp -Ln --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ --debbuildopts="--source-option=-I" \ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} -- 2.20.1