From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057835350645800960 X-Received: by 2002:a7b:cbd4:: with SMTP id n20mr1996489wmi.33.1644495922720; Thu, 10 Feb 2022 04:25:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3596:: with SMTP id p22ls766296wmq.3.canary-gmail; Thu, 10 Feb 2022 04:25:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpRUlI97LFNEPxYKmmt9td2p5ofE7RJN9ViXX4aPLoF1/EuzKgJc5dhgqXvol2Mwjy0hhf X-Received: by 2002:adf:c452:: with SMTP id a18mr6281868wrg.520.1644495921811; Thu, 10 Feb 2022 04:25:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644495921; cv=pass; d=google.com; s=arc-20160816; b=yhlCznsCLYVpWojUyBVYdBWgkophdxPI/Fayanc7y4THedQhISlYQslMgaNAptkOm/ IT4RAAjRZD9aYIq1/MINv4xGdYxnHMvMbkdAMCnmop/zz0TSb6NhUbJduA2V2wtgBvTr ggT3a9MCM73GAMWH+/2ADhaaY+w4FY0nhxW2woNXnYR7hk7aWZLlchjg0ve2CpjXtdfh FL4KZW12WUc7XjPSmX+fXycwJB4rVSa3sRaDSioZ1nFrGVK0Smt1We4m8Tn9W5n7zWYM qBGYcCR/clwja+cny9sWkzCWtOeZ16pby5ZrY2CmltsFaoMfVOkhCcVOr3zvrZRefsZ7 YsFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=1g2f2zir0gP8eIepnoLmvep9uTgh/ejQBbv+qGx5uws=; b=qsLCiD0yW35889u00FM0kfGQme/6rH2+oKjxteSfS9Ms1OXNIBJ+ewkxw9e46F47qi OTM/qr9lYIwZ+JjCou+VFBFk5DJZLk9nKAZBe+dxb6kog//jNtqDu14FQ/+6dWdV/oeZ 0Ucfz1DKQBBGaiTsZhbFzSvd/n86ecTRqo9v/6EHIHxLLz2OY0hohWHVsP0RxcB0Lrmw ZoA6pToAHWhC+hRsU5lVakThkhfxDsKn1dFH8kQZCNrPYjYM2JTfP5qykP/KiWMDy4ck 8Qjn6g18T9/+njszhV3AsDFI7dHeNB4tYkhHnlT6sl0yQAbJpiS5UnEn/g5LEuwpLX8P gECw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=R55LT6Y5; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1b::608 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20608.outbound.protection.outlook.com. [2a01:111:f400:7e1b::608]) by gmr-mx.google.com with ESMTPS id ay1si111275wmb.3.2022.02.10.04.25.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Feb 2022 04:25:21 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1b::608 as permitted sender) client-ip=2a01:111:f400:7e1b::608; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=R55LT6Y5; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1b::608 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IEHocLSaVuo0nhlUdXhgyg5j6To/6dQMCuom1EnBEyGQjh6tZHtoreihMt0x0Hr1WK3kJVzjsp07A7k+XpAeR/Wv4d6C2wcrwc/0INnqBMxUIU/W845rCPYYjx/xSbizhAMwXbZKebPnepsQpLO8qPdjajqCc2QBlkO79u53ek8kOQ5PGNHfB2p+RMAN0tNhxnUAft8rFB+0C5dDWQYVewYKt/40sj19X6Jg1xkWeGKGLIp47RwcGGpjCia2qqxuWGg9EMb9SmxPZg0bg2oUPwYqVUTGEwqk4MO0WM2o2vkx3Ix4wKJtGflJlnr7k3A9h8X6osQUP8ItfzFVSN4RKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1g2f2zir0gP8eIepnoLmvep9uTgh/ejQBbv+qGx5uws=; b=jN7op27TP5LAxBiSG1P4vbYaf4O7Cacd5sGlULOFBIVh0zfSSBvJFhfapiZKWPk3O+HXVPZuBQYV7a7ggqrDxE/wIzghKScuCjKdFhWQtt/z4vxJ52u8/YpSExKSVFVuJkMqtftyKreecHJeh2YPIZ6fRXnqxTcjBeUZLDQMN68pq00tJ/5K4ZVnLQUHg5Z3J4Q7IaftFofBCSKWeZOfcJ3P4l5LN5AM8Nd2U8FKriSMb1qyld9SN3dxrXEe1hO/Sj6P9AvYT/H4ZwraKtAFG3hnjGkTs2YK5TEj3jAGSqsAvpLmeibN+AmcBct+w13PcRFFV58lShAeHFZbf/8hww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1g2f2zir0gP8eIepnoLmvep9uTgh/ejQBbv+qGx5uws=; b=R55LT6Y5kOWVv+MlvfnOv5GGzCjijCT8U7OmiCLIJfoOUXoGoVyVHMuJo1dxQI9zBqcZ5vUnWZGjedDIh8naocRII20mc0PTEObwdi5IPg+mUCSuKuw1lV0i7+L7kfkRoIQ/evOweWBo30S3FpzpVfJ4dtZmj6QNKJm3Vn7iURX5qpyzSCCLHqNMs5YR2/u7q1j1UAvq3Yrhgv4DjH90yI8gFeeIUPGJC+rZJamZJ/7JxocZkorpYS8sxbrix8AxYHm/huDhuLFeVVonFhCLKtRkkwypXC3paa84r3GhxqC9qwjL24RAyXEPqeB0NK2NgOIz4Mc/gXfQIf6KYBpb4A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) by DB8PR10MB3290.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:11f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 12:25:20 +0000 Received: from AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551]) by AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM ([fe80::d433:79c4:958b:1551%5]) with mapi id 15.20.4975.011; Thu, 10 Feb 2022 12:25:20 +0000 Date: Thu, 10 Feb 2022 13:25:15 +0100 From: Henning Schild To: Uladzimir Bely , "Kiszka, Jan (T CED)" Cc: isar-users@googlegroups.com Subject: Re: [PATCH] deb-dl-dir: Use dpkg-deb --field in debsrc_download Message-ID: <20220210132515.52db2852@md1za8fc.ad001.siemens.net> In-Reply-To: <20220127104544.13077-1-ubely@ilbers.de> References: <20220127104544.13077-1-ubely@ilbers.de> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BL1PR13CA0338.namprd13.prod.outlook.com (2603:10b6:208:2c6::13) To AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:155::20) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec85654d-213f-42e7-8311-08d9ec90675b X-MS-TrafficTypeDiagnostic: DB8PR10MB3290:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d0ul3oKp9faw8XTjoMSN7idxAZp6I21csi80PU2GtI6vpLn3vFJBgaOGp7CC7LrAksXF65thhPebpgQdobMrKcXuIcKrUPkBAHd2t4O4iSJFLuwEK8gUYQV4urxNqgm9rvHpv4RZMuyIXM2uKw6FgIUi6GQYrHq9YNTQHMOH790y17sS4B5DioohXE1xeVXTn2A3P+U0/5DhsFtVpcYBtc3kbRfPzVRPkwSUBVHTjUbxJiDImeY9AAlq0qN7K/j1iXoLlBSNY8oSbAjAlpmQeTDLRvxTAnT/shlybimYd62EwPhgSrLZo/lAbR9GtixJhNQ1+uY/yX0VdfsLWuEP16/flgX2lvUuMHyut+aqk77SpSb6fSDBNNca8nyZVclGD5biRVW29dswykWn8zx6e0vuE2cVd8RYAUYtWP9r8S894e6iFkw9HlCImcNzwPAzYbKXHFk7mnaPxmyi+5JykhI00CM5TpRdiMO74FR1p7MKEb58zCd3h5x4FQGeyiurYV8nxNNnUHD2H5zv2NDch3GOpKtGzxkOlahzmo9hniKdjBFjB2gBzDbBM3dPZK1s2ldKDjSkkfVRZOXf0cbmLW2Agkm8OvI0bzXkrKMAk42IxR18xUzdkAF4naSYF6cHppFJnK+vAd1kYxw6gn8dig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(110136005)(316002)(508600001)(6506007)(6486002)(44832011)(86362001)(82960400001)(6636002)(38100700002)(4326008)(66556008)(6666004)(186003)(2906002)(9686003)(66476007)(66946007)(83380400001)(8936002)(8676002)(26005)(5660300002)(6512007)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?n03AKJ+gPQofVy1UNeLiuNkh3DtnVPbyepiN6S9iIAFPYWcBi9jJKTevrAw7?= =?us-ascii?Q?rq1ijAAlvxtsSt7myAk43rHyHmElAAh1lR/g3pd1QuAzraQ+mtHny9ZUpYtz?= =?us-ascii?Q?lOC1aMv8jJbs8Xy4nQ4U0AQFXvazpa8g17VGuWAYfx4lE6n35cbhOW1UjwP/?= =?us-ascii?Q?bETMj+qb3QDS2eeZE6n6CPeegPCDX/4VdV7ngOhrX71gC4MVx4tB75rn9V3H?= =?us-ascii?Q?PP9LAN8nNbDuovz381Lno9MztSZR+Bya+BRy4Q6Ip0Vbp4WY3yxYMt12dkFS?= =?us-ascii?Q?1fLTAZZv3JhU+YCOgM/PqC6pxLR4p5bUEaDedmM6OQaW60qjSdMBnj0CQ3Ct?= =?us-ascii?Q?ajLDouM1vzRiL/pdVS7gq73LN0s+I1n8PbLdtwtBm8pTu9HiPab4/3sxzXpj?= =?us-ascii?Q?S66/gr6l2jgN9K+i2/Mk/W9O7jnG3pwCQI7OQVVo4PcTYhb3LT+dq4NBxTJS?= =?us-ascii?Q?KBanTsKNaKiRXSaBXNjauzWS61dDYVoJMCCF7+9dHbRoe49DGfXtL0/nPPv7?= =?us-ascii?Q?fl0fU/LCiyILfsCkVBwpT3SIVweH0kxIuHbAsNpz2BoigShESD19+olJoq4R?= =?us-ascii?Q?0pHUi3FMqUeB0p6PScCrFpuU77icS/UyRRFt1X5QMqYUCV5eYzUKS7fMJfxp?= =?us-ascii?Q?MPPbvgGwj2DfCEMK6fe2nUSwcpK5IihtU9b/qtvrUqEMgO76iv7m/3gV1dOb?= =?us-ascii?Q?gZgNqI1EQ+RHvdlR48amE7sGXUm5OH6KgBYsGKA85NJrrynLz4w9LiT1Bopx?= =?us-ascii?Q?8a3IF0EgkmBclLmuDWIGYN8KdVUAXkvyE3c84I3Qp1N5coJOr3dOFI77nnNh?= =?us-ascii?Q?RaAcbH9oegHxeegryjanhx1Twb1GbnSpG7Ub2lAmAQ+aK9BaAH87rqBv8s/H?= =?us-ascii?Q?F5kDeKu7+dA1L2ivwuRVRcnJK7S9pksw+meL25y1KhYrpmneNJbfv5o7QWao?= =?us-ascii?Q?oj71EFXVvdljlE62m0Gnfz6gcJnriojCeIsyBiK60fLdl1MIwp05VxbQEAkj?= =?us-ascii?Q?rzN+wOw8GfykUy8a1qXaPHWDiGLauR7pHiQHorKW3mTGcWu3ndKdroyJ/j3F?= =?us-ascii?Q?qquUDdY9HweOb5V2JB/i2W0rvBq1J+ZBUJTkrSO4Lt9maTgfUtmvCmsmI8N6?= =?us-ascii?Q?QLPKy6okhppSZt2BMxUV+j9uu4hIX6Ead/ouk3rtjFPUXnj6wcOUQKb3gMlX?= =?us-ascii?Q?flBIA2Vkxdg/CwNiq2jLMMMLQQOV400L0/LWcibLKX4vbYIZIj8PkwSx2lMO?= =?us-ascii?Q?8CppEOfkp/Fx+zxEyxU8uJ5gA0N+pd0Buj3FLOZLpkr4I6gzK/Z0rnO7FGtr?= =?us-ascii?Q?3/cQcuMqiv5agDCATkrzYf4X8AD9cRJayqA6ZKxtjj0fg4Vy3bCgX0rWHplL?= =?us-ascii?Q?jd1I+03O6E+Jjgc6b4IOmeh/YfS3F3P20pV/KsZSAJPhytEgZAeMnr51DngK?= =?us-ascii?Q?Fe5yLgkjeBaU5GmWzhDw6cFvqtAZgXBczXFjIJddDZWC/dkg3Un8lXi8SBWX?= =?us-ascii?Q?6k9Srx8SaXuIhBMZlS80pI0DpW4FVc2ll/68JD8OklLiZWy3JHALAA1Dmkkv?= =?us-ascii?Q?8D+uADZCetFowkLSp24/buvyXfXzUa9UYwYuDWLV9SIrcWoHoSygqOpOzdKI?= =?us-ascii?Q?iMnMj15sd8vljjUA8dbS4K5yV2KsMGfbNjR4csTo0o8QrQXwFNN5yFQBI5ql?= =?us-ascii?Q?mge5GV/gn6ibx1wUXPYDMbR+kxA=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec85654d-213f-42e7-8311-08d9ec90675b X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB3459.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 12:25:20.6256 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CQYGwzU6GSsDi/g7O2nyNWInsq1J2HrsuE884Yp81pwx9Sh/Bk5/pysIexpDTq5110f9F9mfCGX2ckn87nTlkF8YmJDidC2jm/E9WYzkYns= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3290 X-TUID: QFYaXILj3auk Am Thu, 27 Jan 2022 11:45:44 +0100 schrieb Uladzimir Bely : > 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 I personally find that hard to read and would appreciate some comments on it. In addition i would keep the original code and only take the alternative approach when src == "". Adding a comment and a TODO revert pointing to the bug. Looking at that bug it seems to be a matter of not much time, so the workaround in isar might not be needed if one had some patience or used kas-docker 2.6. In fact i would prefer to keep that patch out alltogether and wait for upstream fixes. Maybe skip the tests doing ISAR_USE_CACHED_BASE_REPO when on bullseye, or use kas. I will send a patch to pin down kas in isar CI. Jan please note that kas 3.0 will have to wait for #1004372 regards, Henning > local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name > "${src}_${version}.dsc") [ -n "$dscfile" ] && continue >