From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.80.186.135 with SMTP id x7mr5484581ede.0.1516884773511; Thu, 25 Jan 2018 04:52:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.182.240 with SMTP id f45ls8040732ede.1.gmail; Thu, 25 Jan 2018 04:52:52 -0800 (PST) X-Google-Smtp-Source: AH8x226o5pl+fgp78x3KDKgiCrRUuX+mGPc3eV7/EJtz9GebxuwkBqIyrQLPsO4B3gVy984rWaPd X-Received: by 10.80.144.177 with SMTP id c46mr6729127eda.8.1516884772817; Thu, 25 Jan 2018 04:52:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516884772; cv=none; d=google.com; s=arc-20160816; b=OBUPAj0T4O8q31WhWHUJvMzpyNpFj267WOFKu9zMjZ48CCsjSEECatuU8KdeOScZvZ nna04Lq/pq3jxfRGYih3kVL3JTVB5uZTdbeWGr+gnCV5IGrEh8AvHwhO6e1Dcz1lA/KP mfF0jCem2HB3sKELc88d5kg6YhUSnD6Je/2y3Vg4yXUt33vO7mb6cM55EkvRlc9LIO1M J2aIdNM36ZbTNqGN9CAp+FoweZikbvickuKcRl0kr+PSZ+7pmSa1fX2b806TcOMeCgX3 42Hpaj0AQZqnfmksdfswBmOHcxvuOWpohN5RK8vkAK+miTfr++2m1hl+4zTkZTYxT1cu H46Q== 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=3yriMrBCquNdR1V+WE3L9Qk2tjst9zyR0qpwwEqLhsQ=; b=g1COQ+NjeWku/7evu+JDAfg8g4nhjo8f8juNEQC/gxUaUawhEGZVg2cZXTWn+nIaF9 zP2+kLkt0uM+ar8HYliFdcRiu5YtwJSA2qOz+/5Qg2IfrndlZoNx29RHszU3b5AVXSon v2An7X21pLdzn965Jewl41W1iCfQRp+HZmSFYpthqzDv3bhqKYeZyf7QskcORANjjGr8 nW2pvNSg9ahjit4mHMhsmtxW/9YLGzqTqYBpwTM90IDWBJ/wbCPf6HcZNoDr1MEw+34o HaBp4TP8SD8RiK7HdncAUs9qXo3kp155QCJt4LfJtYpfsIlDUULJUEgacVNyHsfsAEvk FGUg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m19si353354edd.4.2018.01.25.04.52.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 04:52:52 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w0PCqqH3008455 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Jan 2018 13:52:52 +0100 Received: from md1f2u6c.ww002.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w0PCqqf1003380; Thu, 25 Jan 2018 13:52:52 +0100 Subject: Re: [PATCH] hello: Rename to example-hello To: Alexander Smirnov , 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> <876fd421-d84f-9167-9ac7-8e71f5fb2ae2@ilbers.de> From: Jan Kiszka Message-ID: Date: Thu, 25 Jan 2018 13:52:50 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <876fd421-d84f-9167-9ac7-8e71f5fb2ae2@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: ns5h9HJ3Q/7Z On 2018-01-25 13:41, Alexander Smirnov wrote: > 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? I suppose the libhello changes will be affected by the refactoring as well. But I won't be able to continue on this for the next hours anyway, no need to hurry. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux