From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185045987324329984 X-Received: by 2002:a05:600c:4e13:b0:3cf:a258:99b with SMTP id b19-20020a05600c4e1300b003cfa258099bmr2755148wmq.34.1673007633806; Fri, 06 Jan 2023 04:20:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c90:b0:3c6:c1ff:1fd with SMTP id k16-20020a05600c1c9000b003c6c1ff01fdls1094477wms.2.-pod-canary-gmail; Fri, 06 Jan 2023 04:20:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXtQIhAHxCGnRitx4OkHGd/EzgYnVS2pcNU3RR2S9V9fOx8C4jgBWWW5NArzmJnYSfjppUVw X-Received: by 2002:a05:600c:1f12:b0:3cf:a851:d2f2 with SMTP id bd18-20020a05600c1f1200b003cfa851d2f2mr39421224wmb.21.1673007632041; Fri, 06 Jan 2023 04:20:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673007632; cv=none; d=google.com; s=arc-20160816; b=h23cSX3D1OGMlIroriXs3zNEBgeuu5CBTnnUKLcLS9RpcYeGjjFgTSMmdOzBz2cV5s mOJVnvOxaX3mS+Ecc5mPdt9FacGuU9v0y/5Dg9pcvcueIuf8mbaA94HJFWRKOQf560st wcaTZo+fcNrQxDSLUJGlnx64+2muEgXwqM281qzw43onv7CL6GDF5FpO9fokMdBucjmG tVWFx74+nCLRMScWi1lecvB0y4vma4XfH4dx4wYXnR+lByqnxcQonFW7uAc/MYvLUq36 xGpDYdQcsX0paJesNElb1tREmzy0qumM7fjiLMZVv6LYaiXdxEuHGIWzTiFm5r0wXM0C EDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=GucVXy+W2ZoKHxGgSzy+6dnCxahrlhwUfTwdUIzoGig=; b=MZH3XbTaM1UlkrZd6wzgeINviARPQ1SLlGIRch8fj1GUCtsaqSU495O7m3JMRDcdPd xJSBcD6rCy59NzpxLTc6bjdKj6sxtYVox3a/B8xo6B1vF9T+ywL8ggcn+4uBB2ahiWX4 +Ll7zU6bdukIJ9lKCOdOHISJmz+LuzdVm8Fr6xMGm284kplUdNnW2V4cTM7o8W3CsmpM PeaCXmLbe+eyhcxJfkYzXNbD7CcPOKNPsrBHExLP4Je7KpFxEV+CtL1LQQ0J2+rEJNB0 Yxas+KBJP9G+gYpBb6Ro6BrUSv+OnRJbADX44iLtltzW+ldImbmYBC32KY0wKnuL7T1K GHNw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of postmaster@promwad.com designates 209.85.128.97 as permitted sender) smtp.mailfrom=postmaster@promwad.com Return-Path: Received: from mail-wm1-f97.google.com (mail-wm1-f97.google.com. [209.85.128.97]) by gmr-mx.google.com with ESMTPS id v6-20020a1cf706000000b003d9ae6cfd2esi44622wmh.2.2023.01.06.04.20.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Jan 2023 04:20:31 -0800 (PST) Received-SPF: pass (google.com: domain of postmaster@promwad.com designates 209.85.128.97 as permitted sender) client-ip=209.85.128.97; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of postmaster@promwad.com designates 209.85.128.97 as permitted sender) smtp.mailfrom=postmaster@promwad.com Received: by mail-wm1-f97.google.com with SMTP id fm16-20020a05600c0c1000b003d96fb976efso3400157wmb.3 for ; Fri, 06 Jan 2023 04:20:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GucVXy+W2ZoKHxGgSzy+6dnCxahrlhwUfTwdUIzoGig=; b=vQDiNghAurrKJhFMua12QuPF3+RgE3IfOI0Q14iwL1QhUOlO1VG/6d2KgM9kzVFc0g zG74XYiYe7aGp3yvpds7c8YzeyEERHi1dLFk483SWPt7bsN/GuQWsb3JIMYG7PymW1xJ CPb+CSBizQmwl0zERxSVd+32fhuab6KOwvY4s/JKr689iQQ2AfXXQ8N82yd95a77f+xw 1INcGPKcGoxnuQyXCfsShRQyhXnv6bp062OZybq+H/ckyQA7N1D5UpBkIuT7V7TmNV// gSzOUIUsymMbBIDh4liLKXJ074JksN7+WsOsVhDAlhUME2aJUuYzovylBPlygIrxDXYe yppQ== X-Gm-Message-State: AFqh2kr/S3G5dE9IGrPWjOapMFFUPGPr9Z8ed9abOsvA5EoEh2s16H6o /gh93+ez8aH9JXCke3ZwTKzkHgspCKHs2QryPdTGlFISWRlF0Q== X-Received: by 2002:a05:600c:54c6:b0:3d3:4ead:bb07 with SMTP id iw6-20020a05600c54c600b003d34eadbb07mr38902371wmb.5.1673007631264; Fri, 06 Jan 2023 04:20:31 -0800 (PST) Return-Path: Received: from promwad.com ([178.172.133.66]) by smtp-relay.gmail.com with ESMTPS id p17-20020a05600c431100b003d97003adcasm96682wme.30.2023.01.06.04.20.31 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Fri, 06 Jan 2023 04:20:31 -0800 (PST) X-Relaying-Domain: promwad.com Received: from home.localnet (10.54.231.20) by webmail.promwad.com (192.168.10.44) with Microsoft SMTP Server (TLS) id 14.1.438.0; Fri, 6 Jan 2023 15:20:29 +0300 From: Uladzimir Bely To: Henning Schild CC: Subject: Re: [PATCH] Get back to gbp buildpackage command to prepare gbp source Date: Fri, 6 Jan 2023 15:20:34 +0300 Message-ID: <4586445.vXUDI8C0e8@home> In-Reply-To: <20230105122714.522b7940@md1za8fc.ad001.siemens.net> References: <20230105060757.2918-1-ubely@ilbers.de> <20230105122714.522b7940@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2081133.9o76ZdvQCi"; micalg=pgp-sha256; protocol="application/pgp-signature" Return-Path: ubely@ilbers.de X-TUID: as+ellJEzdAo --nextPart2081133.9o76ZdvQCi Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Uladzimir Bely To: Henning Schild Cc: isar-users@googlegroups.com Date: Fri, 06 Jan 2023 15:20:34 +0300 Message-ID: <4586445.vXUDI8C0e8@home> In-Reply-To: <20230105122714.522b7940@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 In the email from Thursday, 5 January 2023 14:27:14 +03 user Henning Schild wrote: > LGTM > Since this patch is a hotfix for previous patch and it is unlikely to break something, I would prefer to merge it to 'next' a bit faster than usually. What about Tue, 10 Jan, for example? > Am Thu, 5 Jan 2023 07:07:57 +0100 > > schrieb Uladzimir Bely : > > With removing stretch support we switched to `gbp export-orig` command > > instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true` > > one, since gbp versions in >= buster support this. > > > > Unfortunately, this change makes other downstream layers change their > > `GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.: > > > > `--git-(no-)pristine-tar` => `--(no-)pristine-tar` > > `--git-upstream-branch=master` => `--upstream-branch=master`. > > > > This creates too much inconvenience - we need to mention it in > > RECIPE-API-CHANGELOG, use a different variable for `export-orig` > > options, warn user if they still use old variable and, finally, > > support both vars in Isar until all downstreams stop using old case. > > > > It is not worth implementing all this stuff just for switching from > > long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand > > > > So, it's better to just revert a piece of "stretch removal" patch. > > > > Signed-off-by: Uladzimir Bely > > --- > > > > meta/classes/dpkg-gbp.bbclass | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/meta/classes/dpkg-gbp.bbclass > > b/meta/classes/dpkg-gbp.bbclass index f765eb9a..b1d7b240 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_EXTRA_OPTIONS ?= "--git-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 buildpackage --git-ignore-new --git-builder=/bin/true > > ${GBP_EXTRA_OPTIONS} " > > > > } --nextPart2081133.9o76ZdvQCi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAmO4EhIACgkQAUQYBM/2 FkqMNggAjkTVGcfRrxH4CwZK0WR/WnsdeoXcCF7iHcUXvJuwEpVjcXBKq7hcaTY9 7DP8UgsRq/55nruCrptgyi1fvbTNQbcqa/wV4O07IjoOzp8xueJq3hiFELuoUNPr WCmX69Yh6Oc2Cu/FLg0dLfTIZImnP0A2HXKazvrr8naAab4E8McQVqUaiv/m95Se /U0I5PPx/bD2O3hNjke1gfSXfv0C3NLFG84HHLPOe1Jj7lgKT0xqtL2Rz+nSa8Ay ZcLIxqZfIJnme99VLVNKJSZe9YHPP1egcW5oYS/eyBtZA1yF+9VRc2RmEnzYIhpc sdWNCpqHfssc2TdByYSVYrTlmZ8Ztg== =E5Sd -----END PGP SIGNATURE----- --nextPart2081133.9o76ZdvQCi--