From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7219176028600532992 X-Received: by 2002:a67:d38f:0:b0:425:e8fe:f59b with SMTP id b15-20020a67d38f000000b00425e8fef59bmr515201vsj.6.1680845401429; Thu, 06 Apr 2023 22:30:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:41ac:b0:41f:2077:2eed with SMTP id cd44-20020a05610241ac00b0041f20772eedls5622966vsb.6.-pod-prod-gmail; Thu, 06 Apr 2023 22:30:00 -0700 (PDT) X-Google-Smtp-Source: AKy350bViFFQ+CI1r2GzTTlZYxpe7aN34cl6JUS/fcUFLUL3FvCVG3qyWXcr4/Dl5RkxXF2R2tJN X-Received: by 2002:a67:fa52:0:b0:425:a303:e236 with SMTP id j18-20020a67fa52000000b00425a303e236mr227357vsq.4.1680845400594; Thu, 06 Apr 2023 22:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680845400; cv=none; d=google.com; s=arc-20160816; b=PSpEdePyJf+XE9EjovpCJcUB391Coks0QVfq2/rbPMS6WnULFumwULmw2n5oqhzhpR ktZ2tLdGPq7j0Hr7UBC0fqTKLHA5eQOXLb33hLqmEAGZLkJLxWWKOpoYXV+5TqGIR/if IA2suKmXbT0t7JGgoxbX+4ZM4BBYEWtWBl/K/Ei5pbP+vSxab1l1ssaC9StbjfKP1hnX QhtMVNUJoN7oU11h1aKDsi5ZvWbUeQ+6E9P2q76+W/j4zXee1WIPDS3F2Hp92KS5uSJO BktXGszLwivJGAY55I0sWllUWzkG4zONMIoTmY/wg9T6gQE/KGH5D7scNicLHUY52JJb I3+w== 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=AkwVXBNIhEhgrACCQe3/WiBqnCx7rQmTntgtVtqcTNs=; b=GqD1P/OJ1lTko7HJ8M3Aocbhk1I1G3HEa+uXSuwLVy73Eh8q7lCLDTehe9TaQJFpxQ t11mkajzdI4Vy3H4P5q2isJLhZs3jd4IXI66Qd6FmBoCfZqBlQN3YUibtj2Iamc0qxO3 02ngEIacXaZXvfhefbh5qYo5NKEpX8Gbs0Wb2mNl3c9e54uGxKXhxEHIiILMSGR9LL7K RuPaSEvuSEITt64UZOuZgoU9jTzrBqxJlviCWnF5Y4QXrhYxP/iDeiDeiQHH9IF1ltGZ HqUr1Gyg/ZXZn8EihRgEajdYmq7cOUFBa3Lc3Jm2SbKB1F6gy1YDX0cDBMhdowlZInOi pcwQ== 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 x3-20020a056130008300b00690829432ebsi513180uaf.2.2023.04.06.22.30.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Apr 2023 22:30:00 -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 3375Tv1D022928 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 7 Apr 2023 07:29:58 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Revert "deb-dl-dir: Use dpkg-deb --field in debsrc_download" Date: Fri, 7 Apr 2023 07:29:57 +0200 Message-Id: <20230407052957.25630-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: tQBgujtakeMC This reverts commit b75d6eb9 since Debian bug #1004372 is fixed now. --- meta/classes/deb-dl-dir.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index ca2a1ee2..f0ab9714 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -55,15 +55,8 @@ 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 - # Get source package name if available, fallback to package name - local src="$( dpkg-deb --field "${package}" Source | awk '{printf $1}' )" - [ -z "$src" ] && src="$( dpkg-deb --field "${package}" Package )" - # Get source package version if available, fallback to package version - local version="$( dpkg-deb --field "${package}" Source | awk '{gsub(/[()]/,""); printf $2}')" - [ -z "$version" ] && version="$( dpkg-deb --field "${package}" Version )" - # TODO: get back to the code below when debian bug #1004372 is fixed - # local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" - # local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" + local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" local dscname="$(echo ${src}_${version} | sed -e 's/_[0-9]\+:/_/')" local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${dscname}.dsc") [ -n "$dscfile" ] && continue -- 2.20.1