From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057835350645800960 X-Received: by 2002:a1c:a595:: with SMTP id o143mr2975776wme.78.1644513409500; Thu, 10 Feb 2022 09:16:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a3d0:: with SMTP id m16ls28618wrb.3.gmail; Thu, 10 Feb 2022 09:16:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsSGWTRJYLs4aG+xB60D2fDCahO7XDHBH4fGXqn4CseeFAC0/f3v/rF1hounlfQbdoT365 X-Received: by 2002:a5d:488f:: with SMTP id g15mr6982665wrq.564.1644513408607; Thu, 10 Feb 2022 09:16:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644513408; cv=none; d=google.com; s=arc-20160816; b=S4Y2mSPWWsgRJUdyuSgiNQF9lxI1M22eIiCJ8kn2BvsFKhlxu0tc38NsPArQxTCYAA 6GIgBTGOEVg7jxypdDuIdsPMlgJ9TZ5pXk6GV++cRegLh89//13sWehITgfsClGuO80I xchDFAQWbLBvAUbzoQlox9AX9oC4PEI0h3MSQYeJiwvyppFoSSh6f9CyO6V4CY+o63iF A/6Flnzw8N0+NSjITBYxR+iiBroFbV/SKyxmCVjgEhkwBc64eaPwQyPGc9gRLOfrsE6i NHmgTOqAwMDnl+881YUlG5KM0ZbN5tP35rfiJm3sBhN9OgdDU65mPE77fpkgPGTk2vXx Uj6g== 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=qzaLplpLxseu5MoLEuLJY9KVUkD87rRgoAEGFv9afd0=; b=PinSKRv2bKYoC+dRS8h9YxaLc4LU922C6oMQK7wNGe28ZFVtxoS9qvjq0SLiVZp2ZO 23Pe3G3zl8oieFBc9l2bFG3paujXJFYaTSSpHVzeNgcRyhjHDcDyFU6A15+fn/yF5Q0o 8xh6VoLW0JNuHQpYTjAPt3ReLl9Z6MWVtEgE3Tep0wiItC3R7760vqApnxt26IhbO4di yFlL5+L2LKagVSqQf99cH9IDzDhjt45D5cxuxxXZSDlOiL4Pf+ptOP9u5ojDi3H62ntb 244ToN9aWP7OZgj1bZ57B+yhsC9qkm1K1KU74zW2buD7DSwWl8pzbDV4cz4R/4zqla3S SZfA== 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 z15si162919wml.1.2022.02.10.09.16.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Feb 2022 09:16:48 -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 21AHGlg9031501 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 18:16:48 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/1] deb-dl-dir: Use dpkg-deb --field in debsrc_download Date: Thu, 10 Feb 2022 18:16:47 +0100 Message-Id: <20220210171647.12607-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210171647.12607-1-ubely@ilbers.de> References: <20220210171647.12607-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: pmjsSDQaLsd+ 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 BASE_REPO_FEATURES ?= "cache-deb-src" 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 42542d74..6bb8bf64 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