From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:a2e:8515:0:b0:27f:ef82:a485 with SMTP id j21-20020a2e8515000000b0027fef82a485mr793091lji.489.1672838207536; Wed, 04 Jan 2023 05:16:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e8a:0:b0:4c8:8384:83f3 with SMTP id o10-20020ac24e8a000000b004c8838483f3ls156095lfr.3.-pod-prod-gmail; Wed, 04 Jan 2023 05:16:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXvJFzs605ATvCRl3lKCuD+n9trL/m3UH9y+WZNnnczAvGnAVQbMf5SCI+qSKMDz6IUS0jqz X-Received: by 2002:ac2:5e31:0:b0:4cb:2377:b2db with SMTP id o17-20020ac25e31000000b004cb2377b2dbmr5020514lfg.14.1672838206101; Wed, 04 Jan 2023 05:16:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672838206; cv=pass; d=google.com; s=arc-20160816; b=rvcjF2qZaM0K/uCrBQPyUwvzgxQVAsffI+KYL+t6FqUd2Yhq8cVSzk/0agItsj+LKe RCCVk+iO23ZDDKaTk/d6ExQI+7m3PUCLkb61ktNMd3gLb4+rHEVUaDrncjxD/9H/kWzK PvyvrpqVE4UaiCQgPdfJ12pYxONNiG+xHttjrdCC79y2pJKWbs1b0AV/hmxbGS0SbB2/ HUbzBG0ZFvWuqfSVnZYSrwLsVJtcUVPCbGjPuyccc0ZjtsF4Q+vsvesTTiqD4Wx6g3pw 7s6tYAzIjYPBweJB1N7NsYLLGBd1zH5zuzrYzXg/d6NCATVeEmdd7M+TvK/Y+5o1R4f6 GeeQ== 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=xHcW6p4frel3ziWJDaCyZSBp8MnLy3iiUabXLjZ4IX8=; b=Qlcya9I1Bn9ymnWEqcgRdyzOfe2NCYmbayMrM/DHhOHPjyLG6vcCPgrbPKbFMmp1dC YPsCaregEnFxHsTbMDlrW6R4GSW0zsWkQBsk9QXYSC2iKkLwe20ILpLj4x6iTIZc8M7Q 6wITsjcG+4PlYrOjnZjkZI84HPEYYCNEQgpOkZOHMXzsBLyEWhEDvPehCg1wC+Qza9Fn 9IeDoRHhB+dZo4c29HLmAh2q91BnXnbeHnvvkrYx1aiuTtb8RnLfnwYR/eqYiEB7ATpp eKt+ZCreqRdu4eUebQStMN2YeUIcCY9H0ary5w+FDTBczcm4cj8SzAwZCSmJxTnXP+NC IBvQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pSQOR9MM; 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.241.41 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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2041.outbound.protection.outlook.com. [40.107.241.41]) by gmr-mx.google.com with ESMTPS id c17-20020ac25f71000000b004b4f4360405si1117792lfc.12.2023.01.04.05.16.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2023 05:16:45 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.241.41 as permitted sender) client-ip=40.107.241.41; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pSQOR9MM; 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.241.41 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=K3reQq8PcOfPb/WF1sZmLP1n36QTqLC9Q3sNM6ig5FZ0cRnidhewB+i2xue4SPMGPZfWqOL/+Noz4yblfNcS6XWLw86uNU8xWDmNg0vWRM819gqUSPZXXHI5HYK7IXVeC/9lxdQ8O2/ADHi2VI1JLJgT3L99ItfAsUeUJ3GCUMoMFOnDUSxtXZK0vG/P2W9b6fDS10nGvnRm8PpU6St1Xm1jmS2kw9k35dUT4cEKmdJs7+pSznK+d8t8WIqBl07PNLQpgtsVLMoUwOLCU/Gmd77mYolIY6bibS/7iB6T8NPspTj+hYGI/gg+N8PnQISc4UcmcyOttqUkdBKNhUVcHw== 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=xHcW6p4frel3ziWJDaCyZSBp8MnLy3iiUabXLjZ4IX8=; b=d84QJ5N4oTI/wR9oqCG9Dv/kCoqTN8CCGCJHXW7+aGh7PAjdx/hFFH2GBGRfEg6efjfDbg31SfxaoEGX8BdEsmrT+R77u0FydS3ROkbFc+2By8JJ5DAIQP+4/6fixtNFh7r78jUq2xVHkopJCtLaC5msjoqbpJ6O994rSGdqBJZNmHYwIu4gufT4xNWxKLHo2uBcMry9MiNA0rYprmdZjd6+FizkDDrMbf2XGWVkRDs7kcfDWim5y/9IlGgjOrPQU65JLmGZWjNN6DgVX7wA7+tff34ReCtEcR8OGJAOyTH8Q0zqZFgDOZbetnAhkrMR4c+je9JNvBMlByQ7G8vjKw== 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=xHcW6p4frel3ziWJDaCyZSBp8MnLy3iiUabXLjZ4IX8=; b=pSQOR9MMJn4HdR8Gz5IfVduJXI2IYX++yWoABecUz8wUhQCrfvkaPP/nBTp7+g4L+HB+LlsfyabZ6pXVZM5sieZbm8axRB+8yVaxjaVdg78WdSYv/+GEl6f46UDVxnyyZacaJHkfSUGEIUthhyzw62+bW8r0Nv50feXio50escScZdngAh6e1ugFH4iEyYsX0P7+gvasj9WnolHFCj7GcIaQRjSTIj3pTvnBH9I1GQ0t1gnu2V/I5zsJZZ6LNLZ0PCWjqSmNNp5sTaShgi8Ak4exgV9bdU8B3++p6I6qFTJwX5fYvzM1VhhEkoXJrtAVXny1s6OfUm42ohNxOaVgnQ== 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 DB8PR10MB3864.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:165::14) 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 13:16:44 +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 13:16:44 +0000 Date: Wed, 4 Jan 2023 14:16:35 +0100 From: Henning Schild To: Jan Kiszka Cc: Uladzimir Bely , isar-users@googlegroups.com Subject: Re: [PATCH] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Message-ID: <20230104141635.5632bdc1@md1za8fc.ad001.siemens.net> In-Reply-To: <5bafe858-5aa5-cd7e-b0dc-b80904e0878b@siemens.com> References: <20230104065141.8984-1-ubely@ilbers.de> <5bafe858-5aa5-cd7e-b0dc-b80904e0878b@siemens.com> 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: CH0PR03CA0358.namprd03.prod.outlook.com (2603:10b6:610:11a::20) 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_|DB8PR10MB3864:EE_ X-MS-Office365-Filtering-Correlation-Id: 6474707c-43cf-449b-bfdd-08daee55ecc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uotgeuwCnpO8wotbMJAvXKKibfyuuOVB3ye3yc1ZS2ma+jWLjMGEKbpdPl18sfoXFWk2/IL8b5OwQQ/ODKdSCYw6jdwFa9xs1v18Ctx0OdpaoIr+p894s0rgbnAlOJGD4Yh/cF0PCp95Bov5iz1U+wcyUGdSzyjcYNB3ntYclrNHzEDY4D42WxBghsJXTAdXOHKFU7SXM7L0XRgN63M6eWBSLEeaMniTGqtZFmrVtO5W60tlZYw61NZTBfnCa1/ErPDUARK+UVICbxKzlzI856s5gucLydHPBsxC3Moq79xeCzqDBcdb1ahwSkJaA6l5SBIeBStLhdwdt/eJ/Th305Kc5z/7tfAZJ7hVfGNttYMXHc3iM3cOKadEetjgwWbg4C1AFHLwO6fg7+mP+zdatSPUnNRX9jdshVLkSu+VEZ3XnIerElYFOeWjxb/EvDZForgWojJOOvwE8QlaTWureVTKi3vy91PpJkTSYBgmAqWyIQLxfQz9349AL4U0x6RrMueeOOWCG2ZXbdjh9wldpNKajFO1JHm44Qi5VmkzR8cOt5QnQNxny3pU+guPQE8Y4/ANvhlhk2T6DX0Mc3wqUbitO5ePcCbPY07y7B6KbZ142VG+GAjTjV+oCznzoOViQcqHMCAtpk6LqObKSM5pBg== 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)(136003)(396003)(346002)(366004)(39860400002)(451199015)(2906002)(5660300002)(8936002)(6862004)(44832011)(4326008)(8676002)(41300700001)(66476007)(6636002)(66946007)(316002)(6486002)(478600001)(66556008)(53546011)(9686003)(6512007)(186003)(26005)(6666004)(6506007)(83380400001)(82960400001)(38100700002)(1076003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UWoT6gmQPUHBbVQhjL41B4t2BH1nDgIrAa/fgpNm+y59CgVyp9jJSBmxWRsy?= =?us-ascii?Q?IaNfCLuufvb6VfHqxOANQnlOIDYnlBKrLXvKjBcZyEXS+zu6TZ0LLawZKVt8?= =?us-ascii?Q?jR63r3AnNpfBtU+aKKkcsjRE089CGELRTQwZSOwmm8NcmOKeoVh5hyARRzM0?= =?us-ascii?Q?EFIXePCVtEwB0YCCDMcsOfpspjoN2T0CTeF4djw6WuCu1oQgzpeS1KKBnSdP?= =?us-ascii?Q?VJ6v9gy7WmTu7iZgfhG6CkCL7vO5lS+72XwFTY037WR0zO63bkEPpwS7gk33?= =?us-ascii?Q?bD/uFomnwcwyHTTgtgcwwSokUKQTPHfSnhlBZcBgA4vmYysaPsWglvKcICJs?= =?us-ascii?Q?Y9CHSv5KLKTUI6DQjpuQD7dipa9nDWpoQhP7B+Dv0u6CRFIE1mGoqBqRWZKf?= =?us-ascii?Q?dICypAZ2R5AGOvhjBZqy1rqI+EH4D3Z0Qwc78szy3uJnd5xxxWyGyNk2FcBm?= =?us-ascii?Q?voeIny83l9dvVH4o7ozgwrEGQYiv37Y+RyciFkhosjkh3a7umGxJR6KnFYEd?= =?us-ascii?Q?NURCXfI/RDeUZmInR4vGUtlCIZKoXlcGogRphQBCNRm5blJVxxafkm8IEt+Y?= =?us-ascii?Q?lEIoui3FBVXvI3mPA/SKXLkyuE+/LfWYqeVjONR7KeydwTGU27yn4M8GpPaN?= =?us-ascii?Q?jbtIyerEhD1I3LV7EFPrmgw4bselaIWFnvdD6wfxg82IBBnU7aclUnDDGiaQ?= =?us-ascii?Q?3kyCtbePyKokCWVMPJgkKRw5eyZP09Wr3b6eGT3T46Ti/rEQonGLpaijn8IN?= =?us-ascii?Q?PSwbSA4YsvUzpXc/XtDGKCsebhhNZPEdtydmuLgP+RqsOEFtA5q4hjce2mFl?= =?us-ascii?Q?+AnQRsqzDfjfpuXcbNP5lmkyqk8bGx3qcBH+84GN+SMU0dLkkraKm9F+ycRh?= =?us-ascii?Q?ucpBDyxde/ol+1FkaA0psdNcndAnTo5Hjn5S+UCq/iTFjzy0oALQOfqaylD3?= =?us-ascii?Q?efiv4Zx2/3ID8N/6TqLUbjjU6z69Lno42RCmSyDUnwZpe5r0yW4O2PvnC/HL?= =?us-ascii?Q?FtldXAezQSv86TY26ruvA2q1hzUS7aLLSNCAM8528S8xtXq49WC/VWoMwZ3B?= =?us-ascii?Q?PBdWDNfK6aLC5jRuAxTOdlcWZCznZAmj7h8RgykE2BCvng6kpO4YJgTFdIbf?= =?us-ascii?Q?S5diSRZMy2anCZ+QanfcpdpV1EQcAbIWpOmd00udyBdICDrIJtpSaPxIJvJK?= =?us-ascii?Q?Y0/7PrHiQC2V9VMoPwAmGr0bDU1whz2l1QIKJvXnuMbhysFKKVYBtcCvX7UX?= =?us-ascii?Q?wF6dIWqDOdjXLkBLE6JppPLOoqZFhflCrK5chWKVEnYYzO/FmjiJ3xYp5tsk?= =?us-ascii?Q?TpBWFBHrboTqXeaVPDKfbHwTB4qDUBwOtE5iNu96/f1ACm6XTbIquFsmDTEQ?= =?us-ascii?Q?uDb4M48CsS2QSeo13CWSKfdMvUQ5uNp/96zJvLvChIAkcUL4Ydy2rYG4Guv4?= =?us-ascii?Q?dn6ecw/pnSGDmwv6O6SEtJAelqpaYtl1uf6xOerBUFXIGNQI+mDOoVYeabKX?= =?us-ascii?Q?+ibh+OYOwEQd18jYPoGrlYy/icUezgfOqoU1UI2ERriiUAN/f1JnNtqI6y4p?= =?us-ascii?Q?cVe7vzcMmQRs1U2b3Tgt1kv8ppP5ZIzBSFwqlGx9urzWAHOoPfl+VIj7Ehp/?= =?us-ascii?Q?TxyTAbedjohIQ8zKyKRgPYs=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6474707c-43cf-449b-bfdd-08daee55ecc4 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 13:16:44.0949 (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: 6Pn9zH6AFicYaofTdkhHdO5mm13eXV82Q6XPz3fZICzuHoOfUwHsl0Br/qkZ5c6m1A05LuFBH1/N4Bc10lWy2jHmhBz0ulRISfbNc7OeHPc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3864 X-TUID: PwBjaJcL0ZbB Am Wed, 4 Jan 2023 09:20:41 +0100 schrieb Jan Kiszka : > On 04.01.23 07:51, Uladzimir Bely wrote: > > 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` 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} > > " > > } > > Should we issue an error when we detect the usage of the old var? I would be for bringing back the old code if the old var is set. Which will again allow us to gbp any random upstream repo from github and not only the ones that are prepared for gpb ... like the ones on salsa. Maybe we need an example for that in meta-isar ... If GBP_EXTRA_OPTION is set we go that road, if GBP_EXTRA ... the new road ... if both bbfatal invalid recipe, and not like the changelog which suggests recipes in layers should carry both. I do not fully understand why we break all that in the first place, can we not just go back to where things have been. What is the benefit if the change that slipped in with stretch removal? Henning > > Otherwise, this looks good to me. > > Thanks, > Jan >