From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818960455927595008 X-Received: by 2002:a5d:5230:: with SMTP id i16mr40012839wra.71.1588141648880; Tue, 28 Apr 2020 23:27:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:5644:: with SMTP id k65ls1676607wmb.1.gmail; Tue, 28 Apr 2020 23:27:28 -0700 (PDT) X-Google-Smtp-Source: APiQypIeV1/ABvnuOdAhrQ7JtJ8HhCxCmhkGZYcc+ihJvYTqpCSd8wQrUSt9+Cq1zSysB1cIf2a6 X-Received: by 2002:a1c:9dd1:: with SMTP id g200mr1476016wme.82.1588141648345; Tue, 28 Apr 2020 23:27:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588141648; cv=none; d=google.com; s=arc-20160816; b=mZxNRUkocHWl6B2ozsKNXSXg3Dr9rNrUpxwtzr3vIWtDzBeuBufH3xowB8zWOYMLo0 xOzfpys9CSU5ZP521UpvPyctxpS5AYfkBnE7NNNhZslmJ7IFlJ06fdNv7VM69ykj/uyP 6HlSUM3VuN/4vO5hpVbzUL0sqiAloyEVofectCbY1SU2bY7Ah5VHCJAVxUqgdHWZJlq9 W2f11Dg7ik/Pgblp32QQTfGKzz2Tn1m+d8pnydL845idPqAjhk2335Ojk5bBqAyO3MM+ /YG/qUkoPprIOKfDHOC6wpgSs/wNRn2Po0FJl68g53ksqFoWI+e6WG9wpLPPxx+8UZqh zipQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=0EEj7i1RPlaVMOqpb7M+LkSy/ul1TfqKzca+O3F+CBE=; b=kiMGF9K+YmUY0zO7uXb4Nq41LV/LkyfMtU5ihxI6T36mfBK1YFZGgAi1XigW4+/fyC 5XAm0doFmEB7yVsz3nEEF6HbrYuoXL0VHdinQe/4PX9E4VBhXZcEUYXCEkFLmDGL3UIt eqDrOOEFpUUmuANp5iKoJU7M6OnyyMydJmSt0JS7KQgjh/loFyyipLLRIqEyZZ6r9N4J q+DRu5DNZruvTcGMeu+TEGbwStQrDDorVJmt/d4fxSV5V5jguMxMjur2ihxVGq1LGDKe 4dTzwdZN0igx7bHn+OtWzQzE3IubOBONKFiquR1iZBRIT623jYEYqOtcRFwpOUrrntqr tw2A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y1si1174413wrh.1.2020.04.28.23.27.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2020 23:27:28 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03T6RSUx006751 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Apr 2020 08:27:28 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.51.203]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 03T6RRdU028225; Wed, 29 Apr 2020 08:27:27 +0200 Date: Wed, 29 Apr 2020 08:27:24 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] meta-isar: hello: Use in CHANGELOG_V Message-ID: <20200429082724.4b71ad8b@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20200428180026.45a7acf4@md1za8fc.ad001.siemens.net> <4c1fbf72-b59c-9dc4-e8ff-01d0bf8f0674@siemens.com> <20200429075415.25d6d96b@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: u+ohFKQeSEKr Am Wed, 29 Apr 2020 08:10:07 +0200 schrieb Jan Kiszka : > On 29.04.20 07:54, Henning Schild wrote: > > Am Tue, 28 Apr 2020 18:01:53 +0200 > > schrieb Jan Kiszka : > > > >> On 28.04.20 18:00, Henning Schild wrote: > >>> I think with this we might be able to put everything into one .bb. > >>> At the moment we have the inc plus two bbs that have PV in their > >>> names. > >>> > >>> Taking PV from a bb filename is wrong when the inc uses > >>> . > >> > >> "We cannot consolidate the recipes carrying the upstream > >> versions, though, as that information needs to be propagated into > >> ${S}." > > > > I read that but did not fully understand it. If we can not do that > > or fully do that, does that mean the tracking of "" > > can not be fully implemented? Maybe we can fill the gaps or > > document them. To me it sounds like a "half-feature" to introduce > > orig-version as proposed. > > We have two problems to solve here: > > - appending to the exact debian version our own suffix when > patching it > - tracking the upstream version under which the source package is > extracted to so that ${S} is set correctly > > The former is addressed by my patch to debianize, for the latter I'm > lacking a good idea. However, that is generally not a bit issue > because Debian does less frequently the update of the major version, > often only when switching its own major release. Also, patches you > carry are more likely to require adjustments anyway in that case. > > The problem for setting S is not the version extraction like we do > for the changelog. It is that this has to happen rather early - but > after recipe parsing where it normally happens. It would require to > rewrite do_apt_fetch so that it identifies the path and sets S, > somehow. But S can be anything, it is a temporary directory ... afaik. We have S="${WORKDIR}/git", why not have S="${WORKDIR}/${PN}-orig-version" ... really that string and no substitution later on. Or even PN-42-nobody-cares I might be wrong, got a little lost in S and D in isar and still have those gentoo meanings in my head. But i guess it should be the same as in gentoo. Henning > Jan > > > > > Henning > > > >> Jan > >> > >>> Henning > >>> > >>> On Thu, 23 Apr 2020 19:29:11 +0200 > >>> Jan Kiszka wrote: > >>> > >>>> From: Jan Kiszka > >>>> > >>>> Make use of the new placeholder to append "+isar" to the original > >>>> version. We cannot consolidate the recipes carrying the upstream > >>>> versions, though, as that information needs to be propagated into > >>>> ${S}. > >>>> > >>>> Signed-off-by: Jan Kiszka > >>>> --- > >>>> > >>>> Depends on > >>>> https://groups.google.com/d/msgid/isar-users/ebf1ab25-74ea-b3ba-4c48-2ecac873c6f7%40siemens.com > >>>> > >>>> meta-isar/recipes-app/hello/hello.inc | 2 +- > >>>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>>> > >>>> diff --git a/meta-isar/recipes-app/hello/hello.inc > >>>> b/meta-isar/recipes-app/hello/hello.inc index c5f322bb..d81085d8 > >>>> 100644 --- a/meta-isar/recipes-app/hello/hello.inc > >>>> +++ b/meta-isar/recipes-app/hello/hello.inc > >>>> @@ -11,7 +11,7 @@ inherit dpkg > >>>> SRC_URI = "apt://${PN}" > >>>> > >>>> MAINTAINER = "isar-users " > >>>> -CHANGELOG_V = "${PV}-99+isar" > >>>> +CHANGELOG_V = "+isar" > >>>> > >>>> do_prepare_build() { > >>>> deb_add_changelog > >>> > >> > >> > > >