From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:a05:6000:250:b0:282:e899:b63 with SMTP id m16-20020a056000025000b00282e8990b63mr1634542wrz.621.1672825403597; Wed, 04 Jan 2023 01:43:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e182:0:b0:298:bd4a:4dd9 with SMTP id az2-20020adfe182000000b00298bd4a4dd9ls434111wrb.1.-pod-prod-gmail; Wed, 04 Jan 2023 01:43:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXvcfzAXU7z7naiYoUe8002i+WtKI/pMk1ttdxeIdlnY1I9VpZscBGpqmST0PTGpdFoKLaDQ X-Received: by 2002:adf:f606:0:b0:28c:1ae0:e67f with SMTP id t6-20020adff606000000b0028c1ae0e67fmr12297687wrp.55.1672825402288; Wed, 04 Jan 2023 01:43:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672825402; cv=pass; d=google.com; s=arc-20160816; b=zHCoMucWIRMNxitg9C4jm4fJFQbTkUrswZmJB3bzeyeQxjUClU+5A21gM1lqRhLB3i MVukPBHUcghWDq0cvZiqaEkQKIl6VKgB/sqwPwYgTLlLStwXOU9JJ2ZBnnPHdk01yce2 QCGbKW2PufR7/IPtS2BLvyOfCptOQu71xQZFGxCAzk3Xbgi/quR7TSYjcBGJixPyCMtk Z48hnnogGARtcVXsjYCh7DPm1Y/msSYqUK8gYopKASicEb4v8ucIQ+r0foMdWG4tolim UwsadMifDA6ZC4iilRYqkai4y8kg7ElDppUsihhXTqI4t1WgzpLOt1PDM3get3GR7hmI C5rw== 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=BgPpYsz49XmzNI1PNTw4jaIDR0V7ObRF5/Ti0uP8rbU=; b=V/rilx8tIZlc1JKxDSlzIVsh1ONBA9zQzDM1UlYqcsFXK7IPiAUeUcfUW/2EmuqSN9 kou+aPT9W0NnNUljGl+0tPzDZUfI99CNqVH+tHnzM0KR2tewL/cwToSdcZ21tCgTeBPm KclR4XS3hBYAT5BQmD7OQeXGUNHigBqIW+YDPUCdRVMhEGappukDKANc6eMQkV2AWTHL 0pmOEZ60OxY/VCWbgvSS4CIFQ7Bp4DgsoFQjVJQ8nWG9ZdV/wJE0qzXvr02sk6CxlPc8 opyiC6eBpbzOel7mVgr0NEotKxJMbsdm4hiqbjgpM2TPzN7CmgJblblL0Znzpbk6y/7O uKhg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=hycuJOeh; 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.7.78 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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2078.outbound.protection.outlook.com. [40.107.7.78]) by gmr-mx.google.com with ESMTPS id l17-20020a056000023100b0024222ed1370si1329426wrz.3.2023.01.04.01.43.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jan 2023 01:43:22 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.7.78 as permitted sender) client-ip=40.107.7.78; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=hycuJOeh; 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.7.78 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=LI6T2VZCxBxNok5nXFKfvim1f9juv4twB5PNHHRvYQnOxhTrYGTSZfww6elyD2ZI7EFb5fPOrSCOOO3EgX/Y1V8GBdbkOKig5/2gM2XP8IP2KS3pU6mIXQb4b6cl0+Wgk5HGUKyG8qBsjxvLA+nPFCaOW0WSQWDHKTPKB3KRrSGwnRomGUeRg2TFtRvt6oyecH0uaLwWRWUBN54bv9IsdB553y0XQqHSjv3sxlcfk8rRvEoT2IhycpPUmbD6b9YZQaT03XgMs6+14ARu9PZ17KIBEgUs8B5667TNdvXNgVlfXZxMD513QSBwytPl2Zs3M53WRY88azzuYf4fOO7SLw== 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=BgPpYsz49XmzNI1PNTw4jaIDR0V7ObRF5/Ti0uP8rbU=; b=O7O5poXSEsPrRwiBiHSodcBMjRH84G/aGKVLYPXv9T7/p0TAdVWIYHfk7HWQZutAks4DWu9G3vNMyozDEDjnhb3EnRvtuLFq+plD3zxfzMTgJvrGc9WlCipRCWYKNnh9lM0ezENlIdqL4v2eE9LK4UuuQ+oj+VQmcb8d3oEifPESvWIhS7gHkm7d9DMjvljsfOAA1CxmrZNobC66L+hAop3shCPjkjrZ0LcClPVSXv/Ay5lqDS8gywP5n05u+2e4/uZ6Fg1UWsiGV71KtENbhHV3jIoXiFNhXvCp5+A95reAA4zeb3TbzvQnUOJfFOJhzt6PVfX+cWnQgFq2ohaB5w== 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=BgPpYsz49XmzNI1PNTw4jaIDR0V7ObRF5/Ti0uP8rbU=; b=hycuJOehAvi25ojWq1koxSW6k1p6WChnF9nJlV94YDj+2ttZ8k7+26+wHmnmxLo+33tkhMXkYF1251YeWmPDWKRmJt4LgspfyOM/quV44X4zDM4KffmCJVm/rY/25BInq1aNddPEhUrV0EeuuURrc6nlFTn5x64iSDL7rSSRs00OfeNPOazAVdFR7gyH7MXH2pOjmjgBwVpqobnZR/cb2Xgc/ltCR79tzzD4zhJsh8yLJqAFxJ8MdC9TsAlYB4pCoJPfZWGG33vb3opD3HUd9CM+RnCqZ7O4SLKcD0mTGNvjpqyRJbkZhHUd3AXF1psPRPsMLnU24+ki9wGF6+Iv+A== 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 AS4PR10MB5574.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4cd::17) 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 09:43:21 +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 09:43:21 +0000 Message-ID: <5a3c7b92-d2f4-5903-df1e-df043dfee4fb@siemens.com> Date: Wed, 4 Jan 2023 10:43:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH v2] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20230104090700.3916-1-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20230104090700.3916-1-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0118.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::10) 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_|AS4PR10MB5574:EE_ X-MS-Office365-Filtering-Correlation-Id: 12ddc68b-d8ac-4388-a23e-08daee381d9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4h3QWpx0SIrOWzZdVoZHglUykU8GEmWcuvW75O2XD8oZEdYZtMHbxwnf1CILkN84vfYH5zxC7o+TBmYNHJPyEKoGnsNJjWHjaLgReyUBYJLJqjPC8p6kDIDc5hUA7Os1EsX7jj3MJOo/wfd9nUBbSb5VR4Ag4UzefLVw85OIt67Ata7iDcv5iSKTnW7bL+VheFSu5jTQoDdwfTTZg7LCwyu5NNyLu3GSJ3Q6Yf/Mp2/D2PtsBKvC9YomHo55ZzBCvmyGnQqkCXzt2kCcVwgOfBTwe1ZE0nJGHnOz9bdodBtcxbOb65bpArpA/NBLsWEeurEiDpys9lpXsH9xfeGtePd8aX4iEvvT6ByvP9L1Cb+40uikcAoRVbc+qnBfKmpfWzYqF3OeVju7sFw05t9Ct3Sf9aLZKJWUEl7c1LHBF6eCZwMopJ3aZ0+pEeCMApu+m8oXlrlenFx1vSFQYjmD5THNt0CyHGWMPdFo3VppWTncaTMhtVSFvulNW1vXnkkgHzujK+9BgWeNRhnYCkbxN6Jrwlta8Vy28U8fa3xmANOEdCMyU4iPl41cEcS7+czDrDP70q59YOf9zCQY8dwX3CzUcs3J1Nom6YUURMV6cXiE/TBqmkBtNc+65d+gsA3IRwhKOPhMuju+zXKWqU8Sp4u3LaVck3zN1nyO3ZoPKkegngmfeQ23Rg7SbgbcQTTU47y4iZ+e26y/9+pW3IYxljhOP+V8B/Yu7wFzg/G33U8= 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)(366004)(39860400002)(346002)(376002)(136003)(396003)(451199015)(36756003)(86362001)(31696002)(26005)(316002)(478600001)(44832011)(6486002)(6666004)(2906002)(5660300002)(8676002)(8936002)(66946007)(66476007)(66556008)(41300700001)(38100700002)(82960400001)(53546011)(186003)(6512007)(6506007)(83380400001)(2616005)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YWE1NGl4c29uQ0J3dWFZUFVBQjlxMFRqS2N1WWdndzJQUWducWN0K0w2bUty?= =?utf-8?B?K3BjNnhaTG1WNURDQmNndGs3S3pPR2llY0UwbFFVaUFFbU9jcG1RWU1YbzBD?= =?utf-8?B?VjgwVnl3Sk45VTZIOXJrb29tRHFQR2EzTVd2aDNOQkg1T2pGUVhYZUNJWDVN?= =?utf-8?B?ZUJUVHM2MzY1MHliWWg3WFM0TUc2Zi9HMTNlMTNubWlkcytGRFVpeG5Vb0g2?= =?utf-8?B?TWxEL2xJK25nZVNkSEpaQ0RpQUxFZ2plQVRBc1VRdStPMDJNS1pPTzRpdHRK?= =?utf-8?B?UmphK2pXUCt2VVNtaktUc1VCaC8yV0JJY2JZVkZId0pteEhxYkZ1d0liOWVo?= =?utf-8?B?dStkZDNBcVo3MFMvUys5blA2NWJMNGptWXhjZHpobGQ4MEQxSEJ5RTlCL3dY?= =?utf-8?B?K1c3ZERpVGdQdmdwWFYwUytrY1Q1d2psa1ZVYXJPSGlCazkycFZxc2loUEdp?= =?utf-8?B?Mndsanp1Q2RiN3d6RTd5WWI3amx6Zy9SUVpmSEpRQmo2UEp4dXhQYkJnV0dr?= =?utf-8?B?U1Z1d0VmOHdOQmJtM2xrQmlmd3o5aWlyOTd2VWtteFI1TnZkcFcrWG5RYUpO?= =?utf-8?B?NTkzQm1aR1dNa2JvRlkvMjZDYU45V1RqZy9CbXE0QXF2U05UTzkvS3ZLMkJB?= =?utf-8?B?SnNVMzZiMUdTbFArSG5yeGFTVGRnclZUSHhCQjJ4bjdyOGNqV2d3QkxVcDZr?= =?utf-8?B?L2ZhTjhRam93M1RHcDlKcTVxTksvL1JHbktjdkk3bSs0QTBoNjRqUzh5THlv?= =?utf-8?B?Y25qTEIvb0Q5MUkzS1pWRVhocnJ1YU5TQnliY0lmWnJHcWRBbnZZeHltaVJm?= =?utf-8?B?U3lTVmwwTDNDeWtBYXVvcytobFBKTDJSQ0lPNEJlQTRYTzk4UjFuWHQ1Ykl0?= =?utf-8?B?Z2tNK3BOZW9CR0JHSHhKRlVkZEx6Mmk4RVhObVF0TDN2Tk5jS3cwaUpINFpW?= =?utf-8?B?OGxqUnc3WWh5Sk8yYjBwT0xSUGxtOXR0ZTNseDljOEFoNGJiNHIrdzdVT0l2?= =?utf-8?B?VGsycFBlV01JcHd0VXFyOWJiR21rQXNZK3Fkd1BFVmZRL1NzUDZUTFZ2UFZk?= =?utf-8?B?MDMzeG5kSEduWHVsVGUxVGlyNjBDazAyejhtZzRVQ1ZPb1lhbGZlcDNYQUNy?= =?utf-8?B?SFd2V0VveVZ3T0NscXlpYWhIV1FTNUZaNTVaUnJDM2FaRkM1cmdocVplbk80?= =?utf-8?B?Nm40ZktYd1lqcEY3NUdFNXlxdEdITW8yelczb2ljOWxHR3U5bmV3WXNoak5N?= =?utf-8?B?TU1pbDRmdWRsdVR5Wk9MTUx6eEFLMHJzeGVDVEJncnZ2aTEvME9jZ014TzZk?= =?utf-8?B?dnRWTTcvZzdVZFpBcm54ME5BeHYrVzdLa2dSL0tTbFB0dStpaWcrckZFc01K?= =?utf-8?B?dDdtR3YwVVR1bFVsYXJzbHl5Mm9VaFV0amN6NVdnQW1UeEpvckZORkladnVR?= =?utf-8?B?bDg2NGdQRk9GQjBtZDNVeWZXcDI1TGdJNm4veGFCQ3RsQUhwek9HWk56YS92?= =?utf-8?B?TVVTUWd6NTdoTmw1THJkNVRRa214RVExbmtMbUJVRi9Qd1FrVktCT3AzSVMx?= =?utf-8?B?NktOVkc2YTM4Y01IaXY4WTZ3dC9FMi80aVdtVndmWnB4UW1CTW5EbWlNaUZS?= =?utf-8?B?RmN4SFhkbndJek1CQlZSOGhQRmFZRGNSeVBkbjY0ZmlLcURHcHA0a2xIVjdt?= =?utf-8?B?TGhtYUtJcFc2V0JZWFQvbW9td1IzNXROYkFndTJpdzVnajFocTN4b0tiK1lt?= =?utf-8?B?M053OVhSUWxHUVN2T1pMS0RiaE9SMTJjMThiY0Y3b1dhenVGRm55TWdqOHU0?= =?utf-8?B?aGxnbmhYeGRzcjJKQ0d6VFpyeWo2QVRoUVZBOU5iUFl6d1ZGME1ld3hBcWt1?= =?utf-8?B?bWllL0tYVVVkNlgxSTQ3QWxGclJ1a3NHS0tnakxJUlcycnJyVHdiemNEVGdr?= =?utf-8?B?MWZkSjFYUEpPK0kxeFZSVmExRjBScXpwZ1c0YXo3SEFEQlBXa0FrVGtRTldW?= =?utf-8?B?clp0c3dLK2VTYnJOdU9keTNSdnNJS0tQMkszb2x0cDUzV0FBWk9GTERwMzZL?= =?utf-8?B?SS9ENWlJajAxT1d3WFpMN1djaDV0b0M0dkF5ZzY1RUNKNkJkVWMvWnhaNTJ0?= =?utf-8?B?SWcya0NuRS9ZNDlxc2Z4bEhPNGdXNXA2N3BXVDVNYTRYVzI2L2RPeFJpdlhY?= =?utf-8?B?WFE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12ddc68b-d8ac-4388-a23e-08daee381d9e X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 09:43:20.9798 (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: XNSP8TqyMMCL56F1IuX0O3RZZrP4l9daGX/t212qlxSRxocv+O4Io02LYYvo9EwXsjwn9W7kz5ftgP1TayJobQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5574 X-TUID: k9qF2MqDbnLr On 04.01.23 10:07, 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_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} > " > } Still no warning on GBP_EXTRA_OPTIONS usage. Jan -- Siemens AG, Technology Competence Center Embedded Linux