From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6514681807677423616 X-Received: by 10.28.3.11 with SMTP id 11mr895656wmd.4.1516818740585; Wed, 24 Jan 2018 10:32:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.144.41 with SMTP id h38ls3989432wrh.11.gmail; Wed, 24 Jan 2018 10:32:20 -0800 (PST) X-Google-Smtp-Source: AH8x226FM8khV714qHi0TueUCl/N29/zDFUoE+Occ8ijtEyoxI89H+LaESYcDa6wFEvnqpvDBZFs X-Received: by 10.28.184.88 with SMTP id i85mr864303wmf.22.1516818740005; Wed, 24 Jan 2018 10:32:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516818739; cv=none; d=google.com; s=arc-20160816; b=zI2oDfhx9xiZJywkPj4l8TqbTRQ8ObpHpkmNR5sRnSlfGRLclpNl7MadWh/aqPMHb/ OMHw3Aie2dsKtA7tEd9deYLZKfuzF98rgS+bjgommy/WsuR+m8Rs+0RqJAqf1821JykD GdtpNU2FtpjjfqcWk7fy4nfFSmwQeyK5CxBIGqhEIdYmz5kX6zNGKpTffHlkXEEGBEgx PDgjHAxCkd+b/3iLqjmzYKRROJG1jPjFAIvH3uL+qZyKRG33LBOV4y2hemmmz/9DwtLW TN8Wsljg5KrncnwFYN6HG+AWgkGC2LBohr79rID+jgnGDeqrM1lozQJmz/2B8Te9cPe4 L9fA== 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=9SwqRmfs3rPKrNh/Im+fG1riED6oQgKB+kiFX0B8P0A=; b=gEekMhDqSw2Iw9CyHuOFc979dpvZx01mcCPQfe66aM57CnfDhzrV3VeVHJE5l0Z1Z8 DZyOKwRHjtTsuyobkdh3mue0rlXPBJsRbZje9at2CrvNa/LqdZ6A4rIp7O/Ufz75qlzQ 1gktr0Eg/fhNAvYj+4/EBBLD739r3hr3AnJsLTSr8HP6KUI5fB9QalC0DEtP7pQyMNyX TyHx3Q+tYXzHv4GsN73a2tId31IgDRLs0LNEnCtMI3fGNXW9YmTpBCkEQMZfIn7opatK 02TkTS1LUGoq5aQuj7vhMqcdaKyHR1Hl7lTPlkC2tt1TVCCcK/MWiTrxnmvHdV7nyicq Rt/Q== 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 b10si78672wmc.0.2018.01.24.10.32.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:32:19 -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 w0OIWFxr017885 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 24 Jan 2018 19:32:17 +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> From: Alexander Smirnov Message-ID: <0539b0ca-a138-f24a-937e-9e5555e9f95a@ilbers.de> Date: Wed, 24 Jan 2018 21:32:10 +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: <677e1a4b-8d26-8d13-2b56-9eccc29d335d@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: t2DpH1HrbTZh 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. Alex >> + >> +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 >> >