From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.223.184.148 with SMTP id i20mr1242359wrf.29.1516884101971; Thu, 25 Jan 2018 04:41:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.208.199 with SMTP id h190ls3347212wmg.6.canary-gmail; Thu, 25 Jan 2018 04:41:41 -0800 (PST) X-Google-Smtp-Source: AH8x224ueJ22vFw18/FpcAOC5dZTNTbbBBAX/w6hyWLwUvDQVQr9wP/mUyzdwTfD+4807qb8xxP3 X-Received: by 10.28.145.139 with SMTP id t133mr1101363wmd.21.1516884101431; Thu, 25 Jan 2018 04:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516884101; cv=none; d=google.com; s=arc-20160816; b=X8PNOaURRMkdU1ShqYwD1/Apl2YLA/tT1iVUWo/sDb+ypwO993bsl5yY5Wx0eAkhIr GAyPjmAt2Nm4qOzsbeTLR9UyQ0Z11bo+lKwrOM8Cjg77n4tTh8MZsLBjg8Nr/R+TXhK3 TCRSp9bVzl/NFppQfrwhziiTZgHTf2r6yx+0B0X5qs4cyRXyC0mRFnVG4vStVOMvIQyv bFpIfP6/KWNkHL76qllZVmBDpViV7dn5X4odR6f7rPAJLTbY+8lECMSlBmij+ovhNTJZ RwqtMFVvA7j4jVqspjIu7+7SkUajbrhcbWVhdNZR512JKUTsdTFBImFiFtjvrn6WPA2R J0rA== 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:to:subject :arc-authentication-results; bh=L3H6zrD/gAUqrBUnXvaHcT2pFjgXQORlNZ8ZVasrDNs=; b=D2Pr6l5U8O77+gw+7TKc6Eu3DkCVGFQDsHgMm31ksgRwkYQZMowPb0l56O1Xl8tAKK cKxH0KR8ex9rXqoK/VWabumOcXBHbbo8PJqP9YxdYpv9ypvY5pgYR7Yga2lwmZ1Niaa7 imemJ1T6XNfcvFl1zWCY9hVIgERbHig3+oAkC4R+US1ZxstIhUUqQHPPDTWKT8vLW9sj vr/YSoL//ocl7Vj7rAs/btMfLPa1/HMJvJf9vgWa/udbcNLfgT2UeJyOSNLFB2fqiTc7 ULC1jpyqIxnG9IPGeUK1XAO1pdYmCTvAkMb5a9ntS0JVP4J0DviIw8Plwc5ADiIy+GSc 9RHw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id j65si104169wmj.0.2018.01.25.04.41.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 04:41:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w0PCfcOg020326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 25 Jan 2018 13:41:40 +0100 Subject: Re: [PATCH] hello: Rename to example-hello To: Jan Kiszka , isar-users@googlegroups.com References: <20180124181216.30169-1-asmirnov@ilbers.de> <677e1a4b-8d26-8d13-2b56-9eccc29d335d@siemens.com> <0539b0ca-a138-f24a-937e-9e5555e9f95a@ilbers.de> <2ad7344c-d854-ca05-a361-b0a985ab9ef9@siemens.com> From: Alexander Smirnov Message-ID: <876fd421-d84f-9167-9ac7-8e71f5fb2ae2@ilbers.de> Date: Thu, 25 Jan 2018 15:41:33 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <2ad7344c-d854-ca05-a361-b0a985ab9ef9@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: SyXjYdEOIxI5 On 01/25/2018 11:08 AM, Jan Kiszka wrote: > On 2018-01-24 19:32, Alexander Smirnov wrote: >> Hi, >> >> On 01/24/2018 09:16 PM, Jan Kiszka wrote: >>> On 2018-01-24 19:12, Alexander Smirnov wrote: >>>> Pure Debian contains already contains its 'hello' package. During image >>>> rootfs generation, multistrap fetches the upstream one, what is not >>>> correct. >>>> >>>> To avoid this collision and to keep cannonical names for Isar examples, >>>> rename 'hello' to 'example-hello'. >>>> >>>> Signed-off-by: Alexander Smirnov >>>> --- >>>>   meta-isar/conf/local.conf.sample                     |  2 +- >>>>   meta-isar/recipes-app/example-hello/example-hello.bb | 18 >>>> ++++++++++++++++++ >>>>   meta-isar/recipes-app/hello/hello.bb                 | 18 >>>> ------------------ >>>>   3 files changed, 19 insertions(+), 19 deletions(-) >>>>   create mode 100644 >>>> meta-isar/recipes-app/example-hello/example-hello.bb >>>>   delete mode 100644 meta-isar/recipes-app/hello/hello.bb >>>> >>>> diff --git a/meta-isar/conf/local.conf.sample >>>> b/meta-isar/conf/local.conf.sample >>>> index 660958f..33d988e 100644 >>>> --- a/meta-isar/conf/local.conf.sample >>>> +++ b/meta-isar/conf/local.conf.sample >>>> @@ -153,7 +153,7 @@ CONF_VERSION = "1" >>>>     # >>>>   # The default list of extra packages to be installed. >>>> -IMAGE_INSTALL = "hello example-raw" >>>> +IMAGE_INSTALL = "example-hello example-raw" >>>>     # >>>>   # Default parallel jobs for bitbake: >>>> diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb >>>> b/meta-isar/recipes-app/example-hello/example-hello.bb >>>> new file mode 100644 >>>> index 0000000..114ee85 >>>> --- /dev/null >>>> +++ b/meta-isar/recipes-app/example-hello/example-hello.bb >>>> @@ -0,0 +1,18 @@ >>>> +# Sample application >>>> +# >>>> +# This software is a part of ISAR. >>>> +# Copyright (C) 2015-2018 ilbers GmbH >>>> + >>>> +DESCRIPTION = "Sample application for ISAR" >>>> + >>>> +LICENSE = "gpl-2.0" >>>> +LIC_FILES_CHKSUM = >>>> "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" >>>> >>>> + >>>> +PV = "0.1+g7f35942-1" >>>> + >>>> +SRC_URI = >>>> "git://github.com/ilbers/hello.git;branch=devel;protocol=https" >>>> +SRCREV = "5c0ae73fdc97d80b6726e602a1fa0ef00c2c012a" >>> >>> This does more than renaming in the recipe. I suppose the delta in URI >>> and SRCREV come from renamings in the source code as well, right? Then >>> leave a comment in the commit log. >>> >> >> Aah, got you. I've patched also 'hello.git' to rename binary deb >> produced in 'debian/control'. >> >> https://github.com/ilbers/hello/commit/5c0ae73fdc97d80b6726e602a1fa0ef00c2c012a >> >> >> 8<--- >> >> -Package: hello >> +Package: example-hello >> >> 8<--- >> >>> But why is hello.git now on "devel"? >>> >> >> I'll merge 'hello.git' devel to master before applying this patch to >> Isar and drop devel branch from it. > > Perfect. Could you merge the final commit into next? I'd like to rework > the layer refactoring, and this will conflict. 'example-hello' is in 'next'. Do you need 'libhello' now or it could wait? Alex