From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647835775200133120 X-Received: by 2002:a2e:505a:: with SMTP id v26-v6mr204049ljd.5.1548250848370; Wed, 23 Jan 2019 05:40:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5d9d:: with SMTP id v29-v6ls345639lje.12.gmail; Wed, 23 Jan 2019 05:40:47 -0800 (PST) X-Google-Smtp-Source: ALg8bN4oSpE7Y7vnXS3vYHsJJeqOV1uIIOWZ9MV6/5QczTRm5zuOZKqac8a3blh4zTQ0nEBD/oQD X-Received: by 2002:a2e:7803:: with SMTP id t3-v6mr216798ljc.11.1548250847854; Wed, 23 Jan 2019 05:40:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548250847; cv=none; d=google.com; s=arc-20160816; b=YDSuL/yLKsW0hQlEP2APK0X2qDJUFPigyUUDzvvaiDO2KBGwH/fqSRqnnZbNDIrC6u syqyi/uQpFGyU97mW9wr5JH14kVW6k48lNHUgBw2uYX92Dv/qYkeOkIDn0EpiURpTgWs BHhuTpGzNWd1r9/Oai/qGUiCmepWUMRJ1LHKMxY+K1F8oe9r45UPdCxxWaF9K4hWJjcJ QWE81B9+rAwsWboc3QW48Tnxxdo0jcHPt+HbrWm0I94UKaE5J+O3N0CsQQAIlfRInLIQ +NU3ZAUdwCBu8SYeOgOgqi1ejJqmugjJPmSB2GKUfNOTUbVF273aocctWtdbsvB0FwAk 3cpA== 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:organization:references:to:from:subject; bh=n93hibv4sCdNiUrS7T+ssGJFuIWRdWx/Ce8BfbdnjMU=; b=pcmwLTiIE4jhKTcav2SjADRNsz4WKeFXDWUwwJ7coAoVzxbLaBtHVH4CA0Riw1shQF dy/qhKsZI00Ly83Jl1WtGLjl78MBeTr/g3wT1/nUvvr4XiUvjSqc7/+iaREiObmZu7s5 Tx0ZK2eSfK1tkX8OreL5G8XYULGvfzA1avvNuXfvoYa9l9nfsTkjEiScwRb3n6P2pgNg tvbxC/WEDo1AVAo7d3vSHfXniJXw1Yr/jnPCYPsxaxXZC9jmlKLnGs5WTVAXW/i6zB2P Nqh5jEdCFPHUxMfiu08KbN2V3gVYXWYvbQBXQbMbYxh5xL+6ibRRiyPN6xgRtjIG+9vw 0kcw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id q10-v6si117063lji.4.2019.01.23.05.40.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 05:40:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@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 mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.163] (d51a48a80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0NDejB8025299 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Wed, 23 Jan 2019 14:40:46 +0100 Subject: Re: [PATCH] recipes-app: Rename example-hello to hello-isar to avoid collisions with Debian Hello From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com References: <20190118135751.23060-1-mosipov@ilbers.de> Organization: ilbers GmbH Message-ID: Date: Wed, 23 Jan 2019 14:40:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190118135751.23060-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: XeTlJxpNqxiW Applied to the 'next'. On 1/18/19 2:57 PM, Maxim Yu. Osipov wrote: > Suggested-by: Henning Schild > Signed-off-by: Maxim Yu. Osipov > --- > doc/technical_overview.md | 2 +- > doc/user_manual.md | 4 ++-- > meta-isar/conf/local.conf.sample | 2 +- > .../{example-hello => hello-isar}/files/0001-Add-some-help.patch | 0 > .../{example-hello => hello-isar}/files/yet-another-change.txt | 0 > .../{example-hello/example-hello.bb => hello-isar/hello-isar.bb} | 4 ++-- > 6 files changed, 6 insertions(+), 6 deletions(-) > rename meta-isar/recipes-app/{example-hello => hello-isar}/files/0001-Add-some-help.patch (100%) > rename meta-isar/recipes-app/{example-hello => hello-isar}/files/yet-another-change.txt (100%) > rename meta-isar/recipes-app/{example-hello/example-hello.bb => hello-isar/hello-isar.bb} (89%) > > diff --git a/doc/technical_overview.md b/doc/technical_overview.md > index 4f6d954..7efbeee 100644 > --- a/doc/technical_overview.md > +++ b/doc/technical_overview.md > @@ -58,7 +58,7 @@ Typical example, when Isar builds the following configurations: > - Debian Stretch, i386 > > In this case there will be 3 different build subtrees. So the standard > -example-hello demo application will be processed 3 times for each > +hello-isar demo application will be processed 3 times for each > environment. Three different sets of stamps will be used to distinguish > build progress between different bitbake configurations. > > diff --git a/doc/user_manual.md b/doc/user_manual.md > index 2aa291d..3b28e3a 100644 > --- a/doc/user_manual.md > +++ b/doc/user_manual.md > @@ -548,10 +548,10 @@ DESCRIPTION = "Sample application for ISAR" > LICENSE = "gpl-2.0" > LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > > -PV = "1.0" > +PV = "0.3-a18c14c" > > SRC_URI = "git://github.com/ilbers/hello.git" > -SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" > +SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" > > S = "${WORKDIR}/git" > > diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample > index fe81f20..a671b20 100644 > --- a/meta-isar/conf/local.conf.sample > +++ b/meta-isar/conf/local.conf.sample > @@ -161,7 +161,7 @@ CONF_VERSION = "1" > > # > # The default list of extra packages to be installed. > -IMAGE_INSTALL = "example-hello example-raw example-module-${KERNEL_NAME} enable-fsck" > +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck" > > # > # Enable cross-compilation support > diff --git a/meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch b/meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch > similarity index 100% > rename from meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch > rename to meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch > diff --git a/meta-isar/recipes-app/example-hello/files/yet-another-change.txt b/meta-isar/recipes-app/hello-isar/files/yet-another-change.txt > similarity index 100% > rename from meta-isar/recipes-app/example-hello/files/yet-another-change.txt > rename to meta-isar/recipes-app/hello-isar/files/yet-another-change.txt > diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb > similarity index 89% > rename from meta-isar/recipes-app/example-hello/example-hello.bb > rename to meta-isar/recipes-app/hello-isar/hello-isar.bb > index 9b35537..5806f9e 100644 > --- a/meta-isar/recipes-app/example-hello/example-hello.bb > +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb > @@ -8,7 +8,7 @@ DESCRIPTION = "Sample application for ISAR" > LICENSE = "gpl-2.0" > LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" > > -PV = "0.2-86cc719" > +PV = "0.3-a18c14c" > > # NOTE: the following line duplicates the content in 'debian/control', but > # for now it's the only way to correctly build bitbake pipeline. > @@ -18,6 +18,6 @@ SRC_URI = " \ > git://github.com/ilbers/hello.git;protocol=https;destsuffix=${P} \ > file://0001-Add-some-help.patch \ > file://yet-another-change.txt;apply=yes;striplevel=0" > -SRCREV = "86cc719b3359adc3c4e243387feba50360a860f3" > +SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" > > inherit dpkg > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov