public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH] recipes-app: Rename example-hello to hello-isar to avoid collisions with Debian Hello
Date: Fri, 18 Jan 2019 14:57:51 +0100	[thread overview]
Message-ID: <20190118135751.23060-1-mosipov@ilbers.de> (raw)

Suggested-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
 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
-- 
2.11.0


             reply	other threads:[~2019-01-18 13:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-18 13:57 Maxim Yu. Osipov [this message]
2019-01-23 13:40 ` Maxim Yu. Osipov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190118135751.23060-1-mosipov@ilbers.de \
    --to=mosipov@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox