From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.80.186.135 with SMTP id x7mr5194490ede.0.1516867721406; Thu, 25 Jan 2018 00:08:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.170.50 with SMTP id o47ls4767612edc.3.gmail; Thu, 25 Jan 2018 00:08:40 -0800 (PST) X-Google-Smtp-Source: AH8x227TevIJ0+M6THcWgMhgeHEMa1PIH5B/T7yFhhNya8ib40PSzvoR+DZSv+FPmQtGEITnk3zC X-Received: by 10.80.230.18 with SMTP id y18mr6441232edm.2.1516867720743; Thu, 25 Jan 2018 00:08:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516867720; cv=none; d=google.com; s=arc-20160816; b=bC2U1xlMlVcfgZgZY8L2OfGSGE6ok1NnEjPYaIUxeloZ0UAI62SbHvDbEbseUzrZdi x3psBbZHkrPk4wx5g1+babG2yb3kyAFAxietXhGIB5nmAlFFb3PNlcDVqBLthS2i5FKA JT69ejHC3I4ybIvVNwBWTl2gcCMx60GT4cRJmLO+2nPEXtkaqqrFYHMOOX1PivNeOQ5b zij8ENJaYI3ihQvPDM96GMTYBCRrxShafa3tCOZRtSZ+aZEG11T92DWW1gCx4TE26CKd L2ljRbYVVJCTCSHGG1AcEapPOJuyCasDqsbFlz1wptnVT9KASjmOemdn1JXnZ9o3bbzS hNEg== 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=NXCzdXZW3G56KUtWFSAVEiMLW23fHIfvA/nbqDMw3ng=; b=kXdhHDGdQj2DQBJJuXTMFz+8LrYc1W/OHtEKForn9OnAZxXEM1pqd7eqwgChCZ3vht Kuao8vhIfc021ufDhTaO/khn/fZsBDl5+WCxL/vhZymLm+Z6V+kN8pgY3iu1GToK3uBe 9xQSjPqi0stfErBFVb+3eNlfzGg3PqPUnmqS/2KCrawagdoeCjud6QNDIh1Xx7UcjuBx VrvyiV1YSk/x9TrCLGDxQIGFWxW2dRM1WsoKQtSeYl/C8/vWOt2mZX8yvPO6xf38iSQs bDhZtoUknP/P/Bhaa0W3seteHu1u5vhUtd6AvHTFxYlfe/sv9iiXzPiNdxrBYpdZEEUk 73+Q== 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 m19si293545edd.4.2018.01.25.00.08.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 00:08:40 -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 w0P88eq6007401 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Jan 2018 09:08:40 +0100 Received: from md1f2u6c.ww002.siemens.net ([167.87.0.202]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w0P88cTh030252; Thu, 25 Jan 2018 09:08:38 +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> From: Jan Kiszka Message-ID: <2ad7344c-d854-ca05-a361-b0a985ab9ef9@siemens.com> Date: Thu, 25 Jan 2018 09:08:36 +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: <0539b0ca-a138-f24a-937e-9e5555e9f95a@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: BHEoJb/yveDD 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. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux