From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057835350645800960 X-Received: by 2002:a2e:9dc9:: with SMTP id x9mr2577210ljj.105.1643280347134; Thu, 27 Jan 2022 02:45:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:22d1:: with SMTP id g17ls3012808lfu.2.gmail; Thu, 27 Jan 2022 02:45:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqqQTgPWtJLtUN4vvRq5/+VbRkOojqUr0g/7lQxD5byIFD7QERrV8SiW5X4e1qKutqnE63 X-Received: by 2002:a05:6512:3f0f:: with SMTP id y15mr2529141lfa.49.1643280346008; Thu, 27 Jan 2022 02:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643280346; cv=none; d=google.com; s=arc-20160816; b=OEB12/hhwIm+l9UomR2HgJjg3Uq1oEIcoYWbO3zWPyfRJzCUxd6QHadI5+E2c09x2v 6rLr6Da/reKrtxlHGi8lmALK4mwM1dQ7o2HwQqsBqAesZZzdj++J4emcEGNWpE7O/vdx 777hem0MM6JyuqboeGcl4MD4oUcxCRLKdSTI1LV+7f7UHBrAbGJFIOhEjGOIZzqPhPEl loXH6u8sWwE8Nmcmo8xK63/oaTohkVqiPwHB/0cD8c8GE4XEVtxvsIfKK9lBS0Xk2n9J f4RUNwPnzQTqti7oJ4UwBiGwMKpNR2cEmgsF4aWQS0eFPXL2NmkRHp9dQ9TUzR/K9q4f O9zQ== 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=cpzY7KHCc4nwqpIa6edSHyfMLNVG/Ne+ptPwM+rPfJY=; b=WtQfEaPH4GcOyG6EykmP4hCgBAStZdBW9DdS7nVfQ4h856M7hHws4tb5IJhXBA8MyC B+o2encuD/WEEfaPL6pwHu2M0yrsAkt0Tqn0GV8mz4XLsCdqsACrEwDfC8jAa4FxyhR5 7Pk6MZINepndEgBa+5q8Xg/7qIXOsheuoonyasuSAgSYDbPYS72wd0yJenvtR1GPnQY0 DPwGseKIWcbpkgX9FPz5sM6yC7Dx9IdyJCgMVpdlAiIi/HHUCt7Y2sl+9o6hY5dEjudP mB+w5pCqUcWQHNwOMbvnpDVpkjRlUgTYO3HwV7TVh+m5UqLJbVd1y21hK9YNE30rowiY ijVg== 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 r21si93434lfi.7.2022.01.27.02.45.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jan 2022 02:45:45 -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) with ESMTPSA id 20RAjiG4028153 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Jan 2022 11:45:44 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] deb-dl-dir: Use dpkg-deb --field in debsrc_download Date: Thu, 27 Jan 2022 11:45:44 +0100 Message-Id: <20220127104544.13077-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: 0N7FmR3HXCdH In Debian >= bullseye 'dpkg-deb --show --showformat' is currently broken in case of requesting virtual fields like 'source:'. This makes function 'debsrc_download' broken, so build fails when ISAR_USE_CACHED_BASE_REPO is enabled in local.conf The regression came with the fix for bug #972580 in Debian. The issue is reported to Debian bugtracker as bug #1004372. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index ffbff077..ded9b3be 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -51,8 +51,14 @@ debsrc_download() { printenv | grep -q BB_VERBOSE_LOGS && set -x find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do is_not_part_of_current_build "${package}" && continue - local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" - local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + local src="$( dpkg-deb --field "${package}" Source | awk '{printf $1}' )" + if [ -z "$src" ]; then + src="$( dpkg-deb --field "${package}" Package )" + fi + local version="$( dpkg-deb --field "${package}" Source | awk '{gsub(/[()]/,""); printf $2}')" + if [ -z "$version" ]; then + version="$( dpkg-deb --field "${package}" Version )" + fi local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc") [ -n "$dscfile" ] && continue -- 2.20.1