From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.28.184.6 with SMTP id i6mr800336wmf.14.1516817786327; Wed, 24 Jan 2018 10:16:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.47.71 with SMTP id v68ls2323264wmv.6.gmail; Wed, 24 Jan 2018 10:16:25 -0800 (PST) X-Google-Smtp-Source: AH8x226lRBffaWdBK8nom41LZry2qLcaF9jMUyMYaJB/z1j/BPXbctqQi8fNGT70zvGdvUl8scOT X-Received: by 10.223.195.204 with SMTP id d12mr950641wrg.0.1516817785607; Wed, 24 Jan 2018 10:16:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516817785; cv=none; d=google.com; s=arc-20160816; b=rJHhVq6DBkqHNiQ8mPZ35YNlyDG7c2XfNpJZwMjjZOm74dIGoL9yI2ar0oqraH7v3j AQz1/ALEA7I1oto/ZzP8iy6Kyax58c4pAXn6j5roj8AlXO6ytraBmcOZi6oxS0FsNcCK Vjsd3t7Hh6i3QkoZxTxRYiF2csSTaIN8e9cI52evqo5YO1xh1T1rqOxEmO5iXa/goJKr jQYyoMp5dywfGSly5dEOZtnDd9GSU1O3ctDIfQ+0BkJL8XHwcdAMWguFCuZJX7zpksRX ini7gY7iVljS0hU6go2K0wIIFxe4KjmiSjPnOXvn4eQF8jRix56DMG4PqvYqFYpUAZkv +poQ== 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=GaPkPpwGAkt9uJxmFUu3jAlWqcjq4wWNFwgHfm9gX6o=; b=IkCuIMrVqr/9kgC9r89PTaxsSRi5K9wOMrmEN8l1/wrpm3phzQcqwIfUbeFgfwRe5/ X/l7XqjcHy24Bl/RHDIq3693/9tXYHl8GDPZCfP6s1NkjldCI1nkfWW556iCO33z/Jvb vq7RcH3ZYJQwVXWEEhpkfF+AnPkywch2Y50thdb19CDfJ2tYrV3AwXyb/fRcqQMlZbd+ Nv0tlcwU8GWznRhDr49w9+pvqv/3TlilJ+ih194WZ8QP3WIINGnQk8C+ah2PFkUiQ9l1 3E00G2Llklx2a7Ek4jfNh0hqq2sux4437IrXVZoDjsBp723oA9ODHSyKZhegsUGA2a1V 9/6g== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id b10si75579wmc.0.2018.01.24.10.16.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:16:25 -0800 (PST) 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 Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w0OIGOCw029599 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 24 Jan 2018 19:16:24 +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 w0OIGOlI019782; Wed, 24 Jan 2018 19:16:24 +0100 Subject: Re: [PATCH] hello: Rename to example-hello To: Alexander Smirnov , isar-users@googlegroups.com References: <20180124181216.30169-1-asmirnov@ilbers.de> From: Jan Kiszka Message-ID: <677e1a4b-8d26-8d13-2b56-9eccc29d335d@siemens.com> Date: Wed, 24 Jan 2018 19:16:24 +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: <20180124181216.30169-1-asmirnov@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: MxHXt6qtVtun 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. But why is hello.git now on "devel"? Jan > + > +SRC_DIR = "git" > + > +inherit dpkg > diff --git a/meta-isar/recipes-app/hello/hello.bb b/meta-isar/recipes-app/hello/hello.bb > deleted file mode 100644 > index 44b8bc3..0000000 > --- a/meta-isar/recipes-app/hello/hello.bb > +++ /dev/null > @@ -1,18 +0,0 @@ > -# Sample application > -# > -# This software is a part of ISAR. > -# Copyright (C) 2015-2016 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;protocol=https" > -SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" > - > -SRC_DIR = "git" > - > -inherit dpkg > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux