From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:adf:f585:0:b0:285:4b69:ba11 with SMTP id f5-20020adff585000000b002854b69ba11mr981796wro.405.1672820451963; Wed, 04 Jan 2023 00:20:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d12:b0:3cf:9be3:73dd with SMTP id l18-20020a05600c1d1200b003cf9be373ddls15423099wms.3.-pod-canary-gmail; Wed, 04 Jan 2023 00:20:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXvhktvsx1+czKWr8ynkgnxCw/IXzK+OHD8TPW7Tbqg07GnGoe1BzWwzpBaW9XB1XpVwpHES X-Received: by 2002:a05:600c:3b2a:b0:3d9:7950:dc6d with SMTP id m42-20020a05600c3b2a00b003d97950dc6dmr22808277wms.40.1672820450695; Wed, 04 Jan 2023 00:20:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672820450; cv=pass; d=google.com; s=arc-20160816; b=vOkFfReTxLiGD+8NKK0NBL0wq/AhVOYVyOaLf6/cjJoQq+lg/UcN/362JtUMIQgiSz 6QxaEsfNFvVl+EDOsX9VrhHtkLxCDD1AtzywueGekJSn+4elsICJX78jZACPVV69jhRq tqp4N6xhb+YfsZ8tIQJtyioC94vAGzXnYqXYKRBpj2e09BxTdArlKmhEcifSxFcq9nH5 rLlzbZC+w0+VNmpFEEeGAC612OHN8iQ818VvjxCqH09F6HxhNkZjWl/33KBbKXqRQiMd lCdLIIzSfaNtBL+Pvq3oWzm0OxRt1SnRoMOZA0F+2EQsX5S44ozcCtqlsNAPTSab+R72 oxDQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=JhiSBgeyVLPW3cm+ooittOpGT7n9YJuN/RsH0Lx0l2I=; b=08px0QQK9qHSD3zGA5ZORzs+4D975sK1tJv4BOoATvucbIsL2lqxomewZacxGfcphc jAV5q/aO3EsLZ1+ry9J+TKdwtnogqR0nSgTryRf2H8VGRAdDs4d4hhviyp1UKm4Wxfv0 6M2F4i1pYoXht9LE5PJlp9/IFUxQ590xH7oj+bqKAtAX02SCPjTsEXN6nEAUz8E2Zxva YYTnCdvUUXvCZTCbWdT//TWEOPDDy6GO3rUsg7xVdV0RaVE2JIXzODqya6zxP9LHbQWJ gPZ0mZPVuiaiKOHcR58pk+CRCNUeEKB/YYSVVA2o63ORWqvhMG8kPoYUjkuUVXAn5sBH mFwQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=cX6LrbTY; 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 40.107.13.49 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2049.outbound.protection.outlook.com. [40.107.13.49]) by gmr-mx.google.com with ESMTPS id r65-20020a1c2b44000000b003d9cc2bca83si18272wmr.0.2023.01.04.00.20.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2023 00:20:50 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.13.49 as permitted sender) client-ip=40.107.13.49; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=cX6LrbTY; 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 40.107.13.49 as permitted sender) smtp.mailfrom=jan.kiszka@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=cHOylY4M/wN/pBH51HJ8E/+NYrLGlm5XglWBHEYPyvQs6BtkB49PPjxazFFCzEper3PcXr+UwDznw1NVawoeBHlKMCblD163FHG7sWog/OxVnX8EeiEfR5pVndKPrHpwN220LKfj2i+tC49KO+e0/B/lwezRbqHOh+S0jyxrwF34nmOxigqGjzV1J/nLy8wKdOyY3KUxeigbUw+9gadzgQolLdsLm2VrW/NO5PPYwJ4y6YRq96BVN3kHGoutLM8605Lvd8EeBin5kgUrAq2KnYjQbpWr4CfpsQrTBP7QjNNFn5x1tf8SMa9lwGZ3FMN6GAwNAfOK2pp+hIbapVKQTA== 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=JhiSBgeyVLPW3cm+ooittOpGT7n9YJuN/RsH0Lx0l2I=; b=PuslAQ2DgVFbzANavGIo9ROw0WtBIGqD9qIvOqkrsLQGT89xAJpDdGw0U0+HB41JiF8oZTIe/0ICd6F4O9x/DVCkkFjvsk/UKupoCxXQiKAgtnNRutCTw/a1g8a7ZCk/jUgv11ezxSBuYnqR+feQijFs/nr4/NXByv9zfiPEPAc8S+HQpPB1tkJWzzh4/ARwzAFmOW91tBI2RgWekQ04wHi4NblB1tbqocFKAE+LrfWiztpIwmYIzFMydziG2tNuND0iwHEnTMJ1gs1FmxUa6V4wWFRTyVukntu9b+tr/Amn469i64yo6Xi7cEGu3Pq8E/sHqwaZuaWhGQ9tD9RT3w== 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=JhiSBgeyVLPW3cm+ooittOpGT7n9YJuN/RsH0Lx0l2I=; b=cX6LrbTYWE6pwnwgFVwy0CZhFoQeDw4ybUaePIaMm8DNr4pcuXeM8kjTQJ2ac2uv08FB/cFUmTOChuz3wVwkUcYdr0yGSS4O7L2K2dpyYZvqNreCFb5+0fcawGglFS9aQ+Ai1o6Yqv6Y/VTOvP7E3CWzldyBaNL7ZgfqnDTXyzsEjOt/ZrT/dPrELMnJYv5V9sHWveRgfS+FvfjI2IbOgJ/iAEJqjWsvCBxxUp7Q6ZjmtqtRdvUh+agEOmx7tk84Yh1jcDGfXN/iZByQGIA90R8mGpcFl4P8aQs6eOfNqKLr7AngV375IK8AWGoZFlC7/yWp+xJB48q7qVZBMTL3oA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS2PR10MB7480.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:590::22) 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:20:49 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a%9]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023 08:20:49 +0000 Message-ID: <5bafe858-5aa5-cd7e-b0dc-b80904e0878b@siemens.com> Date: Wed, 4 Jan 2023 09:20:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20230104065141.8984-1-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20230104065141.8984-1-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0223.namprd03.prod.outlook.com (2603:10b6:610:e7::18) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS2PR10MB7480:EE_ X-MS-Office365-Filtering-Correlation-Id: a872f878-ac50-4847-2442-08daee2c960d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1Y6pUsi8sWaFGPdr62gk0JA7YHmMnYRhm9SOcxJE4JA51Z/D+1XZOEnCrYSL8vCY7bxk9kx3QngqKK8e2QZSUBRQDCvtyx3t+9Oll9G2BjbcUBbuY4PFjLD7RwKny0lC3BUdLqOIepNtZtucJPfcFCA4K4qXx2QZ9+0pGy3m+kv8Z8WAASka2gGHimrZwWkkdurdEAJV3BwdNS2orjIi2lBR6NF97Hq2CbyJVGMNh/e8laVbyYZmj3K5iRJn0qV16FUgNk4z/6ErTApl0UizMrafqzDA6iYnV2DeJ/AQVEZSCmMF7hW7sM+urzyHChWOuQ5dtrFzQF4uKIAQbj9a8cwtapQ3RPtS6DBONhpZdjjX6iVEssyY12d0tTPFz9WTemvLz177gUO2oNrNGQB0r7ZZTBOZ3r+P5/xdxKY7bpCjaSpjokIhTJjLb/m3Us/0KKisl/7fFPXrLnqHFtRz+t+qsU9qGGQ611bxq72btrWiG4JEo11lCP0mtuXRFo/WwHyLW5e0GVeFhxlgQQ4utJlelSXB08IlZyJHI+nfZl4DDLn3LqxgZqRpuXhhOiz0pOJty+P3JjgtNt41jiAMCSzu3f2F4UFk1YuZHLWa6YmYbSmZd38xuSTtkfYhO8dqsTc1fDzYN/pD9Bns47p2dlKa0zBnvYNndHf7Ksi9ai1hymZBDpuP1//b9GyMXm6CSRPHK1TjeH+7kXgxGmkhs0RnhLl04TFTowFMmbPKI0U= 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:(13230022)(4636009)(376002)(396003)(136003)(366004)(39860400002)(346002)(451199015)(316002)(66946007)(6506007)(6512007)(186003)(31686004)(53546011)(5660300002)(44832011)(2906002)(6486002)(478600001)(41300700001)(6666004)(26005)(31696002)(86362001)(83380400001)(2616005)(82960400001)(38100700002)(66476007)(8676002)(8936002)(66556008)(36756003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OFFPeTF5UEx4S0hWbS80YVBaY3NoTHQ0cEcrVzFOUzNlZXZHTkQ1VlE0aE9s?= =?utf-8?B?dlFPUGxRSjFNY1FTMjZ0ZzhFa05XcVE1WHZqNG1YaTJJdXZMaGplanNENmpR?= =?utf-8?B?NUxuS2hrR1FoSldxYzI0VzBEZEk5N2hhWndjQ1VEQmt4UTdwbk1LL0JqZ20r?= =?utf-8?B?NWVLVVJwampTMytDaW9YdnVzT0NQY1V4dEZoTEs0QUgycW1IRVRPQXRaclZT?= =?utf-8?B?TUY5ZU1FMnFNRlhocEFkdEQ5TFRueklKdnBPelVwZ0IySGdlaEZWMmFwKy8x?= =?utf-8?B?V0RCM1o2OHNwaVhvd0gxcWZEZ29nNEZqTHVha0NaUE5HbmJWYmpQTG5uYUlz?= =?utf-8?B?OXhPcXhRZWRONkVTbktqeXIwZjE4YWRHVDI2VXNuWFFIdk9jNWZzekdkeDg1?= =?utf-8?B?dDNyUTdZS1VvNU5ZdjVBb2FhT0FpNEhZVlpUUmE4UzdiUUdKYUJJdlpsbDdh?= =?utf-8?B?dnMzTjBxRDV3c0xDeEJuaTlPOGQrL0NNRnhoQkw4d1h0OWphZVRjdTF1VjRN?= =?utf-8?B?MUQ3NU4yV21sdlgvbHhXaWVuNUZJK21DdmtieldzakQxejd0amdBdXQ3ZmQ2?= =?utf-8?B?eUZQTGV1eGdQaGVDandNcDBiREl2ODlsdEE0bTNWUHNuTjdnN1d3TnJBQ0F0?= =?utf-8?B?b29lZlJtVDF2KzRGR1VBNWlGM2IzK21iekkvVWRTdHo4RlQwbGcxb1lDOEsx?= =?utf-8?B?Y2UvMXM4ci9NU1NOQ2NJMXBseTNhcGFKWHV0angrQzVXbE15Y01CaE44bnpw?= =?utf-8?B?VGR0bjdzM0pKMTUvRWVVZ05VNm9oMG52Y0x6dUEzbW10L0FVNnMrbTUyeVNy?= =?utf-8?B?cVU3Z29wNTd1Mzdnem16ZlJFZktFMWF2cjV6QUxVZjlSRjMwQW8vbHZsdXlz?= =?utf-8?B?RXJLNEhCWDROU3phQkowNXJydlRINmh0dnB2ajk1NzdsWlRZajlVQTJjZ2gy?= =?utf-8?B?N1NPd1FrcENXTTdWQnl2Z2FnbnBTN2V2WVRvZ3lNMXZpdEJWTmxTeWJYV1NW?= =?utf-8?B?eFAwd2lIRWYxYUxkSzUvcDNmdWdtUU5uaE94dWFXZzIxRlNHYXU2RTFkMnBu?= =?utf-8?B?bEoxTUUxUUVFTElWNVBDaXluZ1BUOXlPL1gxYUtpbE9GNkdsR2dlc3VPak8v?= =?utf-8?B?VVhyR2ZHRXYwWkxzaXd2S2Y4Yi9YL0pmU1BlRG0rbUVWamxNNWFSZUQycTQ0?= =?utf-8?B?SlJzUXlsKzE5WmNTa1JWdTB5bFZLZmxrTlBNbUMwYThrQ0NhN1g1ZU5IUHpG?= =?utf-8?B?UmQzRUU0YytvWlNIbkNWMnlqVkxicFRXNnZtMVpSNWU4dXRQTFcwQ21BaUtB?= =?utf-8?B?RWdCcEMrUGlUZEpsZGpwRytoYmJudEtyRGVZRHc4VUhZNUlaMjdiR3JvZngw?= =?utf-8?B?S1BUSTFleGxZV2VxMFFlRkVsOXg0OGZZVjI2Y2NSVmJvNUQvazI4T25XNWtG?= =?utf-8?B?eCtYeHloeW5JR1lsdXpSbFhoa2xXajJUTDRiRkJyMVJHcFpVQ2ZjOXlqRXNY?= =?utf-8?B?blArV282U2tqelJhUjFFcXNSUUJvMzcxaTJNRDZ4M2wzSk1GaHV2OWQxTWdu?= =?utf-8?B?RVpweDZyQmFzYmNqbTAzU3VGYndRZ2M1VVgyS3I0Y0J2dWl2M1B0Vk0zbDRS?= =?utf-8?B?b0RneVNlQ0FjR3RtOGkyUDJaUmZrZCtPMFdUV0RiK241UFZsMnFXWlk4bzgy?= =?utf-8?B?RFltZDUvOEV4aXlKZkFRcUlOMUlTK3QyTTJ2WlpJQnlNUk9GanMxbGNGeS9M?= =?utf-8?B?WmVtNWNQRUF3Z3lVWVZuU1pGL3IramUrV0NDcFR5N2RlMTViYUpQSWZTbmxx?= =?utf-8?B?K2hGL3AzaFlZMlRvSzY5M2JwVEcrVzNSMWs5NzB5NXJuRTNIWHd2QXhJVUcy?= =?utf-8?B?ak5aTUVtUkExSlNQaCttQTNOQzd2MnY0V0pEcnQrMmNmOUpLL0U2VnpIUmJj?= =?utf-8?B?aVBrOFRFN1lwWko5Sis5M25vSjZwbmtWbkpyVUtYODRaY3Q0NkVLcHBoQ1Uw?= =?utf-8?B?eUF3WWF1WXFCbEFpTEFaUld5TkpMd0Y2cE9LZXhCdmJzS0pzV0prYXZOV1Nq?= =?utf-8?B?T3VjanBRQXlGZ3E3MzRnYzZGRWdCSnZVOUFRWEpyN01VeDh2V1N2aHRVbC9p?= =?utf-8?B?MWRhbkxnMUlpUzBlczVNcTlvejJUYjByUUNOaWZveWhzV3MvU3dRS3B4cFpm?= =?utf-8?B?a0E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a872f878-ac50-4847-2442-08daee2c960d X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 08:20:49.0386 (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: DcnkJqumNNppxtlO5KaZLeJ1TzvFaBbtGRgs51zlTZ6niFfYzTzKZEgcBCC+rttDZUCeL2BH5SxHbtfYVuMvbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7480 X-TUID: vGXAvAFlBgYA 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? Otherwise, this looks good to me. Thanks, Jan -- Siemens AG, Technology Competence Center Embedded Linux