From patchwork Tue Jul 16 05:09:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3696 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 16 Jul 2024 07:10:09 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f187.google.com (mail-pg1-f187.google.com [209.85.215.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46G5A663010468 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 16 Jul 2024 07:10:07 +0200 Received: by mail-pg1-f187.google.com with SMTP id 41be03b00d2f7-791f856d749sf1021668a12.1 for ; Mon, 15 Jul 2024 22:10:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1721106601; cv=pass; d=google.com; s=arc-20160816; b=lJur8Q4KuJUJj6jMQFRGwy3ID7NEOd8Fhw2RNtnP7pOiQl9msaJKXwoIZwmbg3vi0X BtNU8PXN3RJHF5yyLckmVbrUgQejBx/ALAuXRG9vAS8W4nlzD0IH/1eNzSHwvrpVflHS A80ukt6zI0U0MZ3ZHcoKQJ7AcO8/NTXYZ7CrCK9JGM0laKqpbOu7rCZcxeJGlHGY+8k5 nhr0sKmuyS71eILQXgAUJ+pCYwKWOloiMUGkkjBuw+khytbpVB5beMFaIOhQcsYqoXpP OktFsiFf53HlvPDZ4qQQ6djmKFZTERKsUMsVNGNZ4PenE6VdvXFDawy2UBKNy00RIIFR iYmw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:autocrypt :content-language:subject:to:from:user-agent:date:message-id :dkim-signature; bh=T6Yfct6iGzs45eFKwa9Z4KKBC23pmmDfvXsOHYG6Ej0=; fh=aC1e2xpfI43Kuimyc6auQZ9Okl6MbjsxE5oYCrSDjIY=; b=VZ//fpKHCL0KV7pWKq5/lHj5AtYeaLCXpK87bwgnD+Rc4UWCdImBuR2ckeo3HpsrDU oOm2R4fZC8HjUxA9ZA5wqCPkay7ja48g4+X2A0BE8PYEHYszGWCPtBa/eDX/XpH2v9II XbkBL0LYUmqU+W1l6alF6q63WpJogglBohlwGEFMd/RxXPg70GZqL7MnVUxPW4dka9/6 2KGEvMbiL6hUTkfGdqlIfGQtyzUDNYfL3tseXAZ1FmSpkY+xgpYzPQc22Wm3Y2DE5n8X DtlT/1c/vFnqgRV8wLdy0vYe552nA4CZagaf8KQRhoubpvhmanXL97l5/2LmyTJHp9sC cBNA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MziVtYOx; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2606::60f as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1721106601; x=1721711401; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :autocrypt:content-language:subject:to:from:user-agent:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=T6Yfct6iGzs45eFKwa9Z4KKBC23pmmDfvXsOHYG6Ej0=; b=ADRZLci46POqVGWqzP2/3IyZyd7CmxGWd3Dwo6OvOHkhb50rm0DH1cf3a002J/xbap LuJdmUqN9T17+l0IZwikQVWl8G9ZLLM4eWW7OZ0RHLNRtHx3iF0SkrRFiScAMPLvea9G 8TeSqvX7+mJ2mUxNy3r/get6T33Zz6PHqRzIPjMJVyBwFIY+c1pWfB8aislqEupM+17q xXJy93FLczhqzLW2cPH4g8q2fr/EyD5XWMaCyf1id0P5MvggBoGKU1yMGeZXPMCP11kC AZ4wFk97XEZrQ7Zx7o/CzOyn4MciBEntxVMy8uvybDn5JCuEUYjv03STKyMdP/CeFJY1 lZQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721106601; x=1721711401; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :autocrypt:content-language:subject:to:from:user-agent:date :message-id:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=T6Yfct6iGzs45eFKwa9Z4KKBC23pmmDfvXsOHYG6Ej0=; b=DGMZHT7UU7i3hXYtj12EV0oIwZzD4gWP4pYHiHWAac3zrKofX2S3cTf88OusbctBGC dWR78OQ/Hj2qOoUMhoPSCVVlkGntGD4pqI/mE5DfgOf3RW5xo+RZ4DhI+Ji2L9aqCh24 At0sH7INqSB66MwfqkRmUlyGaDka2tgBElgLnHxX3GZOyE0IQMcheMSt3NNWcp2GxaSL 2LpdtHpWnwidXCFwzDBgR4p6hdj9ywmwgHM0uJkag3OW5ImuF4esC9HX/wVdqyENLO/T pHidHKdFS1aNDsjaMKQjnKi4AL0noGCNYzB34hvpXlfUXEG7JssPBcn2wE7OhiWqQ3am zUHg== X-Forwarded-Encrypted: i=3; AJvYcCVCKMF6NxPdMO8INIL4qWsidb2kPGdSsVDSoQn+KKAeiTKNaO4Nx2ZcNGh7YLxZFBmak+8UXWc5UdhkTJ4VRLSLA/yqL0c= X-Gm-Message-State: AOJu0YyTtU8A0jvzuoSB3x2ns8kXQing3KmINul/PoEK9NOCzxy4Voyv kFnwP+1WRDhQvtyvneJbim8QZ2yZqzFwQHgJu9lSCZk9bWW/+kCo X-Google-Smtp-Source: AGHT+IGvxth1EhiV3SlIsr1OYx1SIiYl5G8e3CPrhhbcXkSOm0TGoRrNTWKBECvZUcaO6BaDJ+p3YA== X-Received: by 2002:a05:6a20:7348:b0:1bd:7559:1710 with SMTP id adf61e73a8af0-1c3f122040emr1285541637.14.1721106600851; Mon, 15 Jul 2024 22:10:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:234a:b0:1fb:2bb9:43dd with SMTP id d9443c01a7336-1fbdd49dd5als1545275ad.2.-pod-prod-05-us; Mon, 15 Jul 2024 22:09:59 -0700 (PDT) X-Received: by 2002:a17:902:d2c4:b0:1fa:fc69:7a78 with SMTP id d9443c01a7336-1fc3cb56f79mr11751345ad.30.1721106599475; Mon, 15 Jul 2024 22:09:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1721106599; cv=pass; d=google.com; s=arc-20160816; b=WGr39/fzYODCFDX2PswTBkmkzyXjZQmglb1q6jP6HxsYwfMcfIHA0eXVH18HMnbOzi 1G817VdRBngxCWENtqcHrQZ5gCIeyVw/S/AJbNFzpZ22hEMJwNyKVZMLWkZVV2UqLYWa q/D8GvcXTGioDYq4yfr/kSRX4Y3cUfsJmR8oKL5dlaPTVidWnGAfs9E+YzuaZ7v5Lp3/ oLa2rXDfzwcCfUMvB+0gkCL+iahYRSF1LOC+bpc3AOLliI8PmAbx+C+t/g31Ca0K4AY6 geAOLFfdRLMCU51otNcGpXR+X2mYhRXR+JI9sbimUK/kIv/Bv3yYCqD839TMYgyqUj8r 7ahw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:autocrypt:content-language :subject:to:from:user-agent:date:message-id:dkim-signature; bh=ZpqnQbe7qL4aV+z/8HtHd+Kme6IQ8UTm2B9iuAwxj3g=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=KzsJ5YDKrTJV6w8UUW73wFhwUp3iqFsOWV7icHr6ctPQq2WSwq2nKXhYH0ZouvFfYf IOKIveamaOgU6qegNJFI30/VHcLT3mgB4O5YEIXdhkvhbpGRRM2DPfPgU7ltzleQyfcD iwtHAB7R2PIeZ35cwXAeWM43FQ4AB8zWKD1Fz/vFH3C7Do/U+B+ooiQbrzKRDRJPDZQ9 x5v+HYCJZwYdCkq7m+iSEKGenPoyxxA3LmtG2YJ5d7xsRZ8MjsXdERkDFGBPCK4Gxp1G qOCZ66ixsEwSTlbtsGNkqnrJqUQc2/BVmecNZvUttjYhy/ShwzZLJxwsKgRTgoJE+G4K c4ng==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MziVtYOx; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2606::60f as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2060f.outbound.protection.outlook.com. [2a01:111:f403:2606::60f]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-1fc0bc18c3csi2409365ad.5.2024.07.15.22.09.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jul 2024 22:09:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2606::60f as permitted sender) client-ip=2a01:111:f403:2606::60f; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Pm7jKvuOj2ujvHUfwRZIqNK/IYxmRYr+iN4LYjTI63dZ9Th0279PIDoU0y4a6PoUp/ZPubH3aw2Wu9LU76jpQ/iihGDfV14LZElX/HpfrrYI8UdVoBEzHr556on0qbLZr70tfePxboyUqE1Ne0hpNMOLVUFg+Xi+WXTiCQYjfNE37UgngC22h0Wy9NlVjtAreZuO/BSbowHH6woEiC3HBqoM//Vm6EAT+9zoSPCWjqWlKyXARWK3iwlZbIUDDlB9rMXzIVmR8EEZpQ6khpqzNO0JbHXqIgYqX/oHzgQEQXjrkgZQEhisaVj5lXhHM5aHgMkUx51druPp6K4v5WrBDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ZpqnQbe7qL4aV+z/8HtHd+Kme6IQ8UTm2B9iuAwxj3g=; b=BgndqwZHLqcY1OloOlTCRZsUlYiLfUAcwhF924REAbfzDIrGC/Cewf3bovQnWuKAkm7PyvmK2K4vNs/6cu9BKO9NyHGFjOvmoVKZElz5bimxHjzpy4EMDXuV5j3jjIMnwn42SlDL6tzXmkLl02CpdCe2Ds1kWCoIhbalts9pfoFEdWNkAtgeGkeonh9kXcgRThz/HO5W/K+H0dxQ/wTofrvfT9uskgtjstVzZ5fHuYrHqRdmkCROlilJ4FRIuZRemLBynYo9tBnvbERDv86BiSXmJ+8l9FtIyQU0T5QppieUqd49dWiQTKVCeE5IBsYR5Mrt0bYP7cWVtjb1Ge8e6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS8PR10MB6198.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:54c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Tue, 16 Jul 2024 05:09:56 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%4]) with mapi id 15.20.7762.027; Tue, 16 Jul 2024 05:09:56 +0000 Message-ID: Date: Tue, 16 Jul 2024 07:09:54 +0200 User-Agent: Mozilla Thunderbird X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH] Convert apt source fetcher into native bitbake variant Content-Language: en-US Autocrypt: addr=jan.kiszka@siemens.com; keydata= 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 X-ClientProxiedBy: FR3P281CA0085.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::22) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS8PR10MB6198:EE_ X-MS-Office365-Filtering-Correlation-Id: 74dc4c9e-2a54-468d-6ad9-08dca55588df X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?RmMAlbj8c5E+HJp967aQPZF7bKMDzv/?= =?utf-8?q?k7EQ+O2dnN9bxKerVR+pX6EqNkV+U0IYH4M8JrUjIaHv028sjwIxkjQocqCMOX+Ic?= =?utf-8?q?JQ8XQ9lnuoqUrPnA1iThjzTFcr0UqIJ7hKmNOtB3IeIu8+NP2oaUifaDx0VgSE0pV?= =?utf-8?q?WKcMdTo+vm/izsExWOJZTXISwEfScX7ciaGW2tI5sEjZ8ReZXYgYv+wxYkF1Loarn?= =?utf-8?q?v2G9M5/uVagtaIEZwPIvLopMdz/0rRP0jUuSqSlMQvpwAyVmr8BxUVGpJ3Yp0SVtI?= =?utf-8?q?aJJ7iGa4tDPR+UOuDu8/LiYEu1ABBBP8VJ6xunNv4IYXu13ApdIfopKoEKpEYGTRf?= =?utf-8?q?rViGQzGCw58jRWLLQZq5UXGeTYIjXP7mjaCDH8HddwBJsD9K1psNhjZF25f1Fkrxn?= =?utf-8?q?SJkqgW2gc2BVPxVW8gsozVt8LGtnk2IO0ryUz8UWnvTsdr6/OMp1C+jm26ck6VtF7?= =?utf-8?q?bJcAzJvq1XrRFHocC9po5vVCsxgUv2Phzx45QdDI/87kCHnFgxaYtSimNwrAbXKr5?= =?utf-8?q?R1W4LDjntYAqU6f8pRtHj6QsdV4HIBBAQmHh1AtqN1RKQD+oPy9zBzza2PXh+e2B6?= =?utf-8?q?qwqcADIPtKnnbuwyLfuRHlLcL6dy2fRcvtjIArkgZnnbstZE7r1RNKQs1p0S3GyzP?= =?utf-8?q?M9x+Y3HYYXgebiYg78OhGFxtESijpvoakJOqOxdagBFoLikFqOqGZvmUWOzH+Ky51?= =?utf-8?q?c39f1Fb1w9wqEY5a4SCB+A7rnUKiHc91vz1MqvHtjS6Wxh6225E1/PmqZRb9KbxOS?= =?utf-8?q?QtkIPbK3glzC8qyzjkzKMdS7wDJRKq573i+nCjZRnwiI31yIbZ1jGLIJuWI/BfQcn?= =?utf-8?q?7NkypCxzxgoHYYO9WXagr0GowhmO52qBHkXza6WuiVKO/tL1VdMnvwR2aCIIqyz2Q?= =?utf-8?q?F0D7vwTwntVG18Lpe6qvu+nn7UpTAwXJI41KnaT1g/5V2ntzuJ/UwmF+ODGqq+3Ik?= =?utf-8?q?rFoHU6gEWVycIDIuTfQGTLeEMa0mS8UCuBENDvBAYxIVCpqGVrzDhVtF8Aw7NFYIC?= =?utf-8?q?Q8/dytLZevGxDU8qNlf+QqboXZXFoIV7b6od1uLQFFo1ihkJVotEzGNWnI7yd1llu?= =?utf-8?q?kg4s7527QyxHtobzCdTHw7vsVa17Rsx1vrmyB7U5SCiXL9cYZ2Ryu260NaVCX6Uur?= =?utf-8?q?hCIQfZzchjeB47h0VtzIwtUdnja2l1KS5MvyL5L9k9No8sXTSuMLWmlgOVSBHWPFK?= =?utf-8?q?4EMSfuNNypf6LvewW13ADqzATObs/ppmK74fU4YyTpA0eOSNOGBDjE/zA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?XUv0+3WHSlZmqwo7siW+s5NtpsdL?= =?utf-8?q?GFmRuyH/7spyIXEJ5ICX23cDYNR36zRYjVW8jzIk6sBZEPVpwclqW8gIRSe284EPM?= =?utf-8?q?YfFnG1DXQTF+evt76/i0TE60OkxbCr6N0w6hZ4L/gbNjHSEHPAAjuYFboI2uN8pPE?= =?utf-8?q?wRejRlEezV4DQlm9mVYxziG0CWCrmWD2CJ/HqAvMcVoqDEJhzMCs00UGjotEK7y9L?= =?utf-8?q?ambOEDd26WGRVRK1qymWx7H8ibcG+foSJoEPT8EUAfpl/xkisx5eZAGjyyAVbaPTk?= =?utf-8?q?I7EHqopv1IaV0Fl6EBLzrBFCqNUx+sEsCK3gswrV70Jt+TC/l8EWQpDJ+zo2m3y6g?= =?utf-8?q?KgXlbS6WOJUAkgcVLEhTWLgoaZN9flSixTW35oEChSdmxIN0jCeR/q7yrXoIl4fVI?= =?utf-8?q?WtwZqOnwsTWSOAikKII8TM6W1KKZQ3YGdt6mPLgjG8ITJLpVLz7qu4QKpDJ0tkUeG?= =?utf-8?q?snOaA3jCzKWQEe7SA1TRDiWiN2HI32c0egg8Bf1sR9uwoRCdHe9bVMMjG+CoRPhff?= =?utf-8?q?+1vJrHMAalSfWZ+e0rlGsJBnsGfJghbyUBYbVk8vsKZFvxIfmS31ZB13CQ+LwEzAd?= =?utf-8?q?25ZXkZ/89Mb6dOMFB2yGVazQwXiEp7w8H8YjN+w96MT6O4pHDZmypTQW829kdVDQB?= =?utf-8?q?2z0Q9ESZo9loZBhIB5sSZbg4EmrrPpyBL183Hu6reWQPV8BLr5YBLQpUN/tdNeIO6?= =?utf-8?q?zkxxH3WjFYgDfH5A7e4vUBSqJWdWa7LZs/qxCHlU7qTPvl8qGY7lqFwHamScULJ/V?= =?utf-8?q?BC7yASG/XkkSTgk8fEUPCY5cDVURz+d2Jhfpnlp1NY30JjdZBpX8jU4H0bovjQaFN?= =?utf-8?q?6j1hrMWcsLTyuv68BRaBWvKN9nagsmERtw09RhiyvOPgeTQq0v4MpgohwCzTAkpfN?= =?utf-8?q?UkVnyNpNh/hoLnRbocYAWS0OaJst/eecSEYbSjW6pQ9WI11Fz/nJRJo+BJOCPCGV9?= =?utf-8?q?n6k1frtqS8S1Az0L8pP/AUNk8ELaf2hZBab1IIiDc1RPkGPxoDnRL6rdAUSBlCdUi?= =?utf-8?q?E6DyzAcoSrl6dl5cY7GmqfWSF9hDOQQTt4yTyVJswrS0U1Iizyr7y3ni0UW7zSUqY?= =?utf-8?q?z5ea1HCcYAW6JxyiO45JErmQAP8ojj1yYaib7KKao3h6bU0t12GWnGuSMDjRixhkp?= =?utf-8?q?Tjg4T0ZEofhvn1SYOt+hf1GVJ5c+i32xQRFj83CahoFYEAC1e5T+nc/35dBCggmvX?= =?utf-8?q?l57kXb+dDrCR1eHdCBrevK//r9a3D+AmLbS3mtg1vcJY+BAX84KfAjBfdc8xdPaQU?= =?utf-8?q?4A1Ly79rhr44G25/2frcVWgMCASkL3UrHSVRnswk9kntg7jpArDglkT5k8BHlsMRL?= =?utf-8?q?io1jSFfkHaU0abJ1oDD2wijW7edeBbMMvwFXsczX0QF+lN8UdeFjlBijAHePgnB3B?= =?utf-8?q?uLRbG7EWlglAltcEXR4EyDUR7fqsE29bmkTSJlmrmbK79HFvKUppDzPEya7bAkwMO?= =?utf-8?q?pUNTodmVU7zj6wIeaEG/lADB8Asl5Zwv8va6OgNaM97sjqghhYe1nHO4RHGZ0405R?= =?utf-8?q?trLWKPxxR8my?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74dc4c9e-2a54-468d-6ad9-08dca55588df X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2024 05:09:56.7626 (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: 2SgXs6QvdQ0LyyDa83Z16NHjJIm5WS/sr3pF11a62H4gfw71knp4oR+ElSlsb3CX0tMfTwhvH+cQlVGrsoGeQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6198 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MziVtYOx; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2606::60f as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka There is no major functional difference, but we no longer have to manipulate SRC_URI by registering an official fetcher for apt://. As the fetching no longer takes place in separate tasks, do_fetch and do_unpack need to gain the extra flags that were so far assigned to apt_fetch and apt_unpack. That happens conditionally, i.e. only if SRC_URI actually contains an apt URL. One difference to the original version is the possibility - even if practically of minor relevance - to unpack multiple apt sources into S. The old version contained a loop but was directing dpkg-source to a pre-existing dir which would have failed on the second iteration. The new version now folds the results together after each step. Another minor difference is that unversioned fetches put their results into the same subfolder in DL_DIR, also when specifying a distro codename. Only versioned fetches get dedicated folders (and .done stamps). There is no progress report realized because dpkg-source unfortunately does not provide information upfront to make this predictable, thus expressible in form of percentage. Signed-off-by: Jan Kiszka --- Depends on https://patchwork.isar-build.org/project/isar/list/?series=1248 and https://patchwork.isar-build.org/project/isar/patch/b94f35cd-5fef-4a34-9e5d-8af282afe7c7@siemens.com/ for conflict-free application. meta/classes/dpkg-base.bbclass | 96 ++++------------------------------ meta/lib/aptsrc_fetcher.py | 86 ++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 85 deletions(-) create mode 100644 meta/lib/aptsrc_fetcher.py diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 95cc830d..20c59ce8 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -80,102 +80,28 @@ do_adjust_git[lockfiles] += "${DL_DIR}/git/isar.lock" inherit patch addtask patch after do_adjust_git -SRC_APT ?= "" - -# filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT python() { - src_uri = (d.getVar('SRC_URI', False) or "").split() + from bb.fetch2 import methods - prefix = "apt://" - src_apt = [] - for u in src_uri: - if u.startswith(prefix): - src_apt.append(u[len(prefix) :]) - d.setVar('SRC_URI:remove', u) + # apt-src fetcher + import aptsrc_fetcher + methods.append(aptsrc_fetcher.AptSrc()) - d.prependVar('SRC_APT', ' '.join(src_apt)) + src_uri = (d.getVar('SRC_URI', False) or "").split() + for u in src_uri: + if u.startswith("apt://"): + d.appendVarFlag('do_fetch', 'depends', d.getVar('SCHROOT_DEP')) - if len(d.getVar('SRC_APT').strip()) > 0: - bb.build.addtask('apt_unpack', 'do_patch', '', d) - bb.build.addtask('cleanall_apt', 'do_cleanall', '', d) + d.appendVarFlag('do_unpack', 'cleandirs', d.getVar('S')) + d.setVarFlag('do_unpack', 'network', d.getVar('TASK_USE_SUDO')) + break # container docker fetcher import container_fetcher - from bb.fetch2 import methods methods.append(container_fetcher.Container()) } -do_apt_fetch() { - E="${@ isar_export_proxies(d)}" - schroot_create_configs - - session_id=$(schroot -q -b -c ${SBUILD_CHROOT}) - echo "Started session: ${session_id}" - - schroot_cleanup() { - schroot -q -f -e -c ${session_id} > /dev/null 2>&1 - schroot_delete_configs - } - trap 'exit 1' INT HUP QUIT TERM ALRM USR1 - trap 'schroot_cleanup' EXIT - - schroot -r -c ${session_id} -d / -u root -- \ - rm /etc/apt/sources.list.d/isar-apt.list /etc/apt/preferences.d/isar-apt - schroot -r -c ${session_id} -d / -- \ - sh -c ' - set -e - for uri in $2; do - mkdir -p /downloads/deb-src/"$1"/${uri} - cd /downloads/deb-src/"$1"/${uri} - apt-get -y --download-only --only-source source ${uri} - done' \ - my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" - - schroot -e -c ${session_id} - schroot_delete_configs -} - -addtask apt_fetch -do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" -do_apt_fetch[network] = "${TASK_USE_NETWORK_AND_SUDO}" - -# Add dependency from the correct schroot: host or target -do_apt_fetch[depends] += "${SCHROOT_DEP}" - -do_apt_unpack() { - rm -rf ${S} - schroot_create_configs - - schroot_cleanup() { - schroot_delete_configs - } - trap 'exit 1' INT HUP QUIT TERM ALRM USR1 - trap 'schroot_cleanup' EXIT - - schroot -d / -c ${SBUILD_CHROOT} -- \ - sh -c ' - set -e - for uri in $2; do - dscfile="$(apt-get -y -qq --print-uris --only-source source $uri | cut -d " " -f2 | grep -E "*.dsc")" - cd ${PP} - cp /downloads/deb-src/"${1}"/${uri}/* ${PP} - dpkg-source -x "${dscfile}" "${PPS}" - done' \ - my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" - schroot_delete_configs -} -do_apt_unpack[network] = "${TASK_USE_SUDO}" - -addtask apt_unpack after do_apt_fetch - -do_cleanall_apt[nostamp] = "1" -do_cleanall_apt() { - for uri in "${SRC_APT}"; do - rm -rf "${DEBSRCDIR}/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}/$uri" - done -} - def get_package_srcdir(d): s = os.path.abspath(d.getVar("S")) workdir = os.path.abspath(d.getVar("WORKDIR")) diff --git a/meta/lib/aptsrc_fetcher.py b/meta/lib/aptsrc_fetcher.py new file mode 100644 index 00000000..2a4b5b9d --- /dev/null +++ b/meta/lib/aptsrc_fetcher.py @@ -0,0 +1,86 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +from bb.fetch2 import FetchError +from bb.fetch2 import FetchMethod +from bb.fetch2 import logger +from bb.fetch2 import runfetchcmd + +class AptSrc(FetchMethod): + def supports(self, ud, d): + return ud.type in ['apt'] + + def urldata_init(self, ud, d): + ud.src_package = ud.url[len('apt://'):] + ud.host = ud.host.replace('=', '_') + + base_distro = d.getVar('BASE_DISTRO') + + # For these distros we know that the same version means the same + # source package, also across distro releases. + distro_suffix = '' if base_distro in ['debian', 'ubuntu'] else \ + '-' + d.getVar('BASE_DISTRO_CODENAME') + + ud.localfile='deb-src/' + base_distro + distro_suffix + '/' + ud.host + + def download(self, ud, d): + bb.utils.exec_flat_python_func('isar_export_proxies', d) + bb.build.exec_func('schroot_create_configs', d) + + sbuild_chroot = d.getVar('SBUILD_CHROOT') + session_id = runfetchcmd(f'schroot -q -b -c {sbuild_chroot}', d).strip() + logger.info(f'Started session: {session_id}') + + repo_isar_dir = d.getVar('REPO_ISAR_DIR') + lockfile = bb.utils.lockfile(f'{repo_isar_dir}/isar.lock') + + try: + runfetchcmd(f''' + set -e + schroot -r -c {session_id} -d / -u root -- \ + rm /etc/apt/sources.list.d/isar-apt.list /etc/apt/preferences.d/isar-apt + schroot -r -c {session_id} -d / -- \ + sh -c ' + set -e; + mkdir -p /downloads/{ud.localfile} + cd /downloads/{ud.localfile} + apt-get -y --download-only --only-source source {ud.src_package} + ' + ''', d) + except (OSError, FetchError): + raise + finally: + bb.utils.unlockfile(lockfile) + runfetchcmd(f'schroot -q -f -e -c {session_id}', d) + bb.build.exec_func('schroot_delete_configs', d) + + def unpack(self, ud, rootdir, d): + bb.build.exec_func('schroot_create_configs', d) + + sbuild_chroot = d.getVar('SBUILD_CHROOT') + pp = d.getVar('PP') + pps = d.getVar('PPS') + try: + runfetchcmd(f''' + schroot -d / -c {sbuild_chroot} -- \ + sh -c ' + set -e + dscfile=$(apt-get -y -qq --print-uris --only-source source {ud.src_package} | \ + cut -d " " -f2 | grep -E "\.dsc") + cp /downloads/{ud.localfile}/* {pp} + cd {pp} + mv -f {pps} {pps}.prev + dpkg-source -x "$dscfile" {pps} + find {pps}.prev -mindepth 1 -maxdepth 1 -exec mv {{}} {pps}/ \; + rmdir {pps}.prev + ' + ''', d) + except (OSError, FetchError): + raise + finally: + bb.build.exec_func('schroot_delete_configs', d) + + def clean(self, ud, d): + bb.utils.remove(ud.localpath, recurse=True)