From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6818960455927595008 X-Received: by 2002:a05:600c:2941:: with SMTP id n1mr1320049wmd.25.1588140610919; Tue, 28 Apr 2020 23:10:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a754:: with SMTP id q81ls2169375wme.3.canary-gmail; Tue, 28 Apr 2020 23:10:10 -0700 (PDT) X-Google-Smtp-Source: APiQypLtFKKXDM4cKzUOysU6FFR+lAJcnBgiUGv2b7b5ZJS4IjZlie61qyup8LgNKJUTPp3Mf+e6 X-Received: by 2002:a1c:7f86:: with SMTP id a128mr1250280wmd.95.1588140610242; Tue, 28 Apr 2020 23:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588140610; cv=none; d=google.com; s=arc-20160816; b=nDmilIQpO+n0NGSTcR8cqu2ehPZk3uFNK+Vq7Dis7DBB3dZYkk01AboRd4sFXdtxvh igdUPrai94O7yLWngm24b/M+XehQJ65mB06s/20NQZQJNCsFHJUFtg2RvC067lpqinVk +0C2V7vgCDEK+z1tJ6ai35lp1QUgr9DNhWVjqLTVxNEM96llPSkqaO/TFYdi/LWl2rYF 8TahYcc8T9tROh9xnIOP44ggqZD2K5WcGGiWfob7/K6qo1//ZOZ41tuARdVpG64cmRwJ rUif/D/Y3u9es/4vqGu5vh+HVRmElUK/Bc+mCE+yhKqckyFhmPjlfEv5sOg9sc+iwKVA 3o1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=c6vv1QJ8UcrLXIwkX0OLtbl+LYn0aMDrs3F+S5pmMiM=; b=jW9W1L//m1Ty0C0r8fof7+fDPt2zYYr28kVhAOqLwHdtVUgXF5f/xM9oHnmFrX4Rjc 5HN3qfZL8p7qxc4rYMJDZsDUrcP0oMWG6W5QBS9WUsXj/bi8P06g1z29RSkL31Pbwb1d /Ezq3uLPxNd3VgYP196UO10BUuH186Xu49I3y4O6Wy7Rz/O76ZETZpX43EKvSe4bMcxx jQWxBYRHgmd6W5LJCaOLv7GiOxSy6NQsSH4mPHviHPQv69VdRIT2looyjUjAD//ZUxWv ZWOKt1I1h925p0GMLU3vqCOOhAaQOzV6t8iNR4DvZtrmVa/ajUciYjbWB2Gl1hu+RO4A DYVg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m4si1311510wrn.5.2020.04.28.23.10.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2020 23:10:10 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03T6A9PO007277 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Apr 2020 08:10:09 +0200 Received: from [167.87.241.229] ([167.87.241.229]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03T6A82W005581; Wed, 29 Apr 2020 08:10:09 +0200 Subject: Re: [PATCH] meta-isar: hello: Use in CHANGELOG_V To: Henning Schild Cc: isar-users References: <20200428180026.45a7acf4@md1za8fc.ad001.siemens.net> <4c1fbf72-b59c-9dc4-e8ff-01d0bf8f0674@siemens.com> <20200429075415.25d6d96b@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Wed, 29 Apr 2020 08:10:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200429075415.25d6d96b@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 6SFX3MuiRr3w 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. 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 >>> >> >> > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux