From: Alexander Smirnov <asmirnov@ilbers.de>
To: isar-users@googlegroups.com
Cc: Alexander Smirnov <asmirnov@ilbers.de>
Subject: [PATCH] hello: Rename to example-hello
Date: Wed, 24 Jan 2018 21:12:16 +0300 [thread overview]
Message-ID: <20180124181216.30169-1-asmirnov@ilbers.de> (raw)
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 <asmirnov@ilbers.de>
---
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"
+
+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
--
2.1.4
next reply other threads:[~2018-01-24 18:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 18:12 Alexander Smirnov [this message]
2018-01-24 18:16 ` Jan Kiszka
2018-01-24 18:32 ` Alexander Smirnov
2018-01-25 8:08 ` Jan Kiszka
2018-01-25 12:41 ` Alexander Smirnov
2018-01-25 12:52 ` Jan Kiszka
2018-01-25 10:52 ` Baurzhan Ismagulov
2018-01-29 16:26 ` Henning Schild
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=20180124181216.30169-1-asmirnov@ilbers.de \
--to=asmirnov@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