Re: [PATCH] hello: Rename to example-hello

[Jan Kiszka <jan.kiszka@siemens.com>]

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 <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"

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