From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:a05:651c:1034:b0:27f:c563:591 with SMTP id w20-20020a05651c103400b0027fc5630591mr2453383ljm.486.1672820934492; Wed, 04 Jan 2023 00:28:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1182:b0:4b5:3cdf:5a65 with SMTP id g2-20020a056512118200b004b53cdf5a65ls2815259lfr.2.-pod-prod-gmail; Wed, 04 Jan 2023 00:28:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXuIPOc1tXUiNDZxVHTLOgddbrQZZKzmzBWBjchgTgANO8JN+mXbRiOUpjht8MnULmKkoH66 X-Received: by 2002:ac2:430d:0:b0:4cb:1a9f:6ae4 with SMTP id l13-20020ac2430d000000b004cb1a9f6ae4mr6413711lfh.30.1672820933205; Wed, 04 Jan 2023 00:28:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672820933; cv=pass; d=google.com; s=arc-20160816; b=iGKfmd7CSLEzgHHcskzbE27NA+3+k81QBco2loTyXIbkutiwxsW60EqJShJm61ipYA TXzOD9HYmiMcJqzHvgOuvD8lxcW4Agl8nyfgj6CCDc1tCaU7KMiiCpfG4Rtr2aXacmh7 xO4fl1/XCiRCqZZmrRGzmn0QrP5HS0PY9AHtFTLlKR9N+6G7NUn/r8ZU7FwZHztGwp4T iIHXlG11+pro2qyMl8JbtqW1PVmqOEQYPeQK5p29AEzqRLX4fuBXKWO1kA5L/pDlYAGZ MQ9YZT9FLkpx/xBNfyndUT9rxvO5a52jFmgMphKpUB/0rG51oqTvXrv/weqZQKEjdYEs tr3Q== 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=Q0NMUntS7Ok6fpqk177APlIuMVJrE+Gn9WuZPDtUSQo=; b=Cl0/4KQKW0v29wSc+igwnJ3SL4QcGaaxGolriRd4QNMmQ4DXWG1NXYeK8wJAmyRt1E AwGNZy7u6+/wwD4qvmbEqBvahT7dLQ8uxoQV21FojNcAauAiT1P2mYFaecqv1/9qOFbu 1kSiBQLGrYVUFhqqrYqPvXC07gLXFeOfIIr45h3AnUlrRTYCeCBtviUnD9q5YKc4Zfjz Vk2Z9h/erL24KWUOsf2MbUMHajG1yvs4v2p1SShG2fecZlKxpE/gzyi/sXhFcO/07h3M +DMr5E4FdYXc1fIgBSTHYGqtLqxA4pxm+E3Nn5DKyg5VcYaNVpg8VJp5SX5rBuv26XeK ORKQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="VeHIk/Xx"; 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 henning.schild@siemens.com designates 40.107.20.57 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-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2057.outbound.protection.outlook.com. [40.107.20.57]) by gmr-mx.google.com with ESMTPS id o22-20020a05651205d600b004b5767257ecsi1260229lfo.8.2023.01.04.00.28.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2023 00:28:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.57 as permitted sender) client-ip=40.107.20.57; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="VeHIk/Xx"; 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 henning.schild@siemens.com designates 40.107.20.57 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=Qmc2N6JIIoChMMQrj1IMH5njofs/VxnX21FqxvjnanSk1zkH2bgV69d4LrwcLi88r1ntC4DmTqr1M1PmXAusM3kMl1bFszMCbbovVt5vpY76JNOmEnZtCQpaccWrpewoN+OsU41W8sLJyxsher5wK1OFrbxOKtuOxgUfkgmnPXRO7TJHuqbdSi7uXFgVgp+47nwlW/ACfG3w46WO5llAhnA2m9ezp5UbahwaH8PGFPKlk7OFS+dr99tQDh1ZWS9rRuZDghkb/ffMV8bM1CUq4hiGNjbroBL08kfW6Ii/LTrG0ex6p847fku1FDZCnTs6Lv6NhO47KVN8CzsVUry84g== 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=Q0NMUntS7Ok6fpqk177APlIuMVJrE+Gn9WuZPDtUSQo=; b=oHsPp8m1udm9VUGaG0ALwG4a43ykceRAgMUdyc4Ts76UW40hpWmFULf3cwxYo+o4B13LQiP21dy9pa+skHZOcp3jLr8DsvIGGJX8h2NTmKM8wlC7JV6UScdS29sHoUkc0ueHJnGMNCr4DSNFSh56TSCGJ6ANXx9+J+MfMe0Y15NYpC3x3fqfT+YoiKywA61hP2v0XNdmTUVuJTIzTNdtNrskT+tDdLiqhgCjEhYHN+2ja5+WnaR/v7qGjlZKDd5OWZLLkYZPq7jMejDbeWNR16rJGffbHfsWTL3F/abRrp8SzqG5hA9uQmn0tKOEvROpYmXb5MXMe40Zzxy0BHLoOw== 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 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=Q0NMUntS7Ok6fpqk177APlIuMVJrE+Gn9WuZPDtUSQo=; b=VeHIk/XxGZorsO5jTWz0byO1eot3D7ldihwZp80poTUE3MmQmpo3CYndiMzbCDVOqGBbVvFu4FQ8Fw8bbgtyM97IUyAw6oxWz3wFcoY230u4dK2XI3y4b2945Yxfpe9GoDeF04jZ6VHNbmsSN9PBA5Ep3UfbD4U8Dr8eqWDvWu22PhC99kb11AJg7wEz9qDTkTaRKEBgYc+C22b1UrPtLcnTyFr7MzJ6GWIz+7mDYiaIPrbtkgBIGEWMYmC1cSmVGM3bcdMxaT7JxohpEKI7GYuJKPPPAEoZ34g6Cc9O1kor2ff6FxrLXH07XU1mREN7SCnOnTC+csAodWGxeO8mxw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by VI1PR10MB7733.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:1bc::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan 2023 08:28:51 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023 08:28:51 +0000 Date: Wed, 4 Jan 2023 09:28:47 +0100 From: Henning Schild To: Uladzimir Bely Cc: isar-users@googlegroups.com Subject: Re: [PATCH] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Message-ID: <20230104092847.27e284f6@md1za8fc.ad001.siemens.net> In-Reply-To: <20230104065141.8984-1-ubely@ilbers.de> References: <20230104065141.8984-1-ubely@ilbers.de> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0091.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::11) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|VI1PR10MB7733:EE_ X-MS-Office365-Filtering-Correlation-Id: 63dabfe4-706a-4d39-f163-08daee2db57f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4jz8+7t4Sme0P08S16vCNiHPzWpJ0qnfdAwDkiXXGnGhfdiokbGWNCrIQxdRZryO1oBv/vK7I8xnV9AR4HHVKs+LVmOOBtuMH1BGjXTZKzrvBaeHxej6ApjXo6bXs3TIGqLgGGz6VFS5fYytxH95eh6xBqgKbCd3Qk9v3WAZUJZeas+O0zJGyDqUHM9L5mh+xDIiUX7YtphMP7gsidC1xtu1B6gFvXoGN4VfgefDi9Cbe0BFfceekLD8w7wiu5rnPm2STmrJNQJuvs+77Bw4pd9WD1g73vVqO/VZE2gYXebLvd1i1f6L8gXu9AqoFVDN/OGLMnYL6+lkEnkqw/MN+VDr+zDK7WsGnRYituQba6u+GYwlC0j3/eGwcB748PZfEeQx5qZz9JeM04VYFI3MZfy0IdMDIrRg8z01FY6+1cTYAe9CpMIumtUO1TCy8nqu0W1u6qMVE6MnpSv2eBSiqeqQaDrA8gsTXVhKCqxCImzKQvrNPsFvhXbzDIhSMXSIYpoL/P4+9BrqzMfbGBiMDikkxoc9K4cET+cPij1kqxyFibvRzVvOuwVTov/+duMgIusfFk9spOTHOK4V/V42aHoTgGK3XiPCMY/tXo3hrRF9nT0qttFzCbiXT+RONfQJl3eW7kP5ASz53U1d7b4KAg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(366004)(346002)(396003)(136003)(39860400002)(451199015)(186003)(1076003)(9686003)(83380400001)(6512007)(86362001)(38100700002)(82960400001)(44832011)(6916009)(316002)(2906002)(4326008)(66946007)(41300700001)(8936002)(5660300002)(8676002)(66556008)(6666004)(66476007)(478600001)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CTzUnxkuG/SJeHUSiBGfyXuWDBnKVggskUp3grnTf1rJN+nkzdaylNIZy+2Z?= =?us-ascii?Q?/FYhUgz7YSUXwHXNetRbjDZk4HV2dGl2NfOoch5RQHeWX+tCw3hTZxBoy9BV?= =?us-ascii?Q?PvJhqa8Hqtn15ev0rEThaQCA3WlcYX6Rc9MNlaodc0hmTpkeB59I271vsXHo?= =?us-ascii?Q?kaqrr4OIcZufv1zhXy7xCmwAs3Jf5rLfAY110d9m8wR9UrSL8cGAzj/Try99?= =?us-ascii?Q?4NeQpi1+KHEz2F6bAESa/FGN4Brk1CtKtS5SL8WmnLgzTJdVxxfoowgefDB7?= =?us-ascii?Q?e9PgttQ0rDrOmBMRZgT/+gJZ9F1MSeAzsOXP1259NBVm0Uh2C55CVONhlq5c?= =?us-ascii?Q?Zy0m27U71J1NsN0MQB21Na37vfsy+McWW5dOCdl90Zk6oNY2E5kvTBEhH5y2?= =?us-ascii?Q?2g105R2XZnoqtKXRSv1t4lZetYZVB7sI2OJpvzFMZDowAb5Xoo2VR6wba+IL?= =?us-ascii?Q?mrpCemoNMJsPipOIoI8530KcHtp6fEsYrYRLjJyFaAR2aW4gf0YfNpIynvkD?= =?us-ascii?Q?tKxZA04THCBhBzVwlYbjNjykArVZn/r+miCUUEJKYIzqiQSPu2DV3j9Q4Pix?= =?us-ascii?Q?e4tN/6Oi0LPA0LKkkkI69g8z3STyDUUyKAXWuby1wffANMJT0Tbmr03gCe+O?= =?us-ascii?Q?wQgxyO0XzOuwsSl48/efZCPbhO7q/oHRrwI9yz5PbHLNoh5AiqiAP4Qo+Wew?= =?us-ascii?Q?TkF89Th7xz21jMP9rNFXz6WMm3n6Jxy6ZAwMzVwLJxOBZzx4ZbFoWdIb3Mz6?= =?us-ascii?Q?f2AJ84gb5HNUsbGTck/BIm5ouLCnWBgafGU1zZVMaReuiJsytdvaKFLc7pDP?= =?us-ascii?Q?V6ucz/+eV9a/SKj7gHhVW7talO0dqGFTjy8vkjmIi3XzzU2mDamJiSj3iSLT?= =?us-ascii?Q?Kkn7hKQ1xlXLW8kpsk2oqUcnzfBlOn5Jt4Oh2VYssusL8ayE6EscveetYhp3?= =?us-ascii?Q?tr26uoqm4I/eulC5Wf1/1Z2UTkLYSptPcvUPCIjFr2Aex1xGR/tm8ehvU7Qr?= =?us-ascii?Q?G/Kvrzer0/fT0QhLrle1wCnQgwXzkIQMKGy0sd35pCHWCOMiXzDsSFFPnV3J?= =?us-ascii?Q?M8LGQcHM3lv+UMctozIwMdy8I4QVEKb1OBsv2lww7k+vIb+8kHZTjpXIxTxB?= =?us-ascii?Q?ICQXUSmkx5+H2INjec9Jfz3AsWZIIj5fB5A7jJtZTvrv3IB6mED8WkRvNbs0?= =?us-ascii?Q?X/oppiz6CmRryAPcC5W+WWKddQW8Tskr68Me5dW7WKpZHOREeBWvgpFCooDa?= =?us-ascii?Q?SkhCaRFBcOdOhNpcs/2axh/zsA5vgg6cgX1mEstXqB1sxBbChdNr4HbWJL8C?= =?us-ascii?Q?KcYf6RhjwkmQ6JKW8N8QcvLSjNhCcPrRw0D+adsk/LgLnBPhGdphfM34IAYp?= =?us-ascii?Q?mSsRxbA6N5nVsqT+J06t15fCxTi7eIXT8tgx/8WDo4y6tMd5PO9AoQuEzdGI?= =?us-ascii?Q?pYsgs1+gtBjww7ofvfxIztCcSP48O7Dl5tRijB9UZxcjrLTopQIN/26ilVLP?= =?us-ascii?Q?GrUDRG87/F37rJmNwOdKmDqNb+fyfSUnoq5ZTF0jRJKnqUtkLNbvfYDkM48e?= =?us-ascii?Q?xwk39xn5175CZQ8j3KthiT5sMozdYaB5ZhsVNSnzoD4Psu+sk3Y4SXlCfVz2?= =?us-ascii?Q?MAM+DMIJu7hZT5rIGQDiADi6FCDJNXwpQiBy0kJ2HIlebsQz4UlPIx2SC6Mj?= =?us-ascii?Q?9Tuv3A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63dabfe4-706a-4d39-f163-08daee2db57f X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 08:28:51.4038 (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: jI8IVZZd8BsytnEzixrq9sYt2s/B7xUtke3xFb1s1kxmrlE+3WZSO8OcjkdJtdnF3nX3r95S8co7yev5rIJpzqR70HxBBrethGW372zXowQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB7733 X-TUID: 2oqwFjYcjOwd Am Wed, 4 Jan 2023 07:51:41 +0100 schrieb Uladzimir Bely : > Since we now use `gbp export-orig ` and they need different > options than `gbp buildpackage`, we should store these options in > different variable. > > This patch intruduces `GBP_EXPORT_ORIG_OPTINS` GBP_EXPORT_ORIG_OPTIONS > variable and > describes it in RECIPE-API-CHANGELOG. > > Signed-off-by: Uladzimir Bely > --- > RECIPE-API-CHANGELOG.md | 16 ++++++++++++++++ > meta/classes/dpkg-gbp.bbclass | 4 ++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index 0bb83389..8013e585 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -441,3 +441,19 @@ exist, empty variables are forwarded. > > **Note about reproducibility**: the forwarded variables must not > have any influence on the generated package. This mechanism must also > not be used to inject build configurations. For these cases, > templates should be used. + +### Switch to `gbp export-orig` and > `GBP_EXPORT_ORIG_OPTIONS` + > +Since Debian Stretch support is removed, we can now use short `gbp > export-orig` +instead of long `gbp buildpackage --git-ignore-new > --git-builder=/bin/true` +to prepare gbp-based sources for building. > + > +Options for `export-orig` should be specified with > `GBP_EXPORT_ORIG_OPTIONS` +variable in favor of previously used > `GBP_EXTRA_OPTIONS` one. For example: + > +``` > +GBP_EXTRA_OPTIONS = "--git-no-pristine-tar > --git-upstream-branch=master" +GBP_EXPORT_ORIG_OPTIONS = > "--no-pristine-tar --upstream-branch=master" +``` > + > +To support both old and new Isar, custom recipe should have both > variables. diff --git a/meta/classes/dpkg-gbp.bbclass > b/meta/classes/dpkg-gbp.bbclass index f765eb9a..4e29f62d 100644 > --- a/meta/classes/dpkg-gbp.bbclass > +++ b/meta/classes/dpkg-gbp.bbclass > @@ -9,13 +9,13 @@ S = "${WORKDIR}/git" > > PATCHTOOL ?= "git" > > -GBP_EXTRA_OPTIONS ?= "--pristine-tar" > +GBP_EXPORT_ORIG_OPTIONS ?= "--pristine-tar" > > SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" > > dpkg_runbuild_prepend() { > sh -c " > cd ${WORKDIR}/${PPS} > - gbp export-orig ${GBP_EXTRA_OPTIONS} > + gbp export-orig ${GBP_EXPORT_ORIG_OPTIONS} > " > }