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

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

On 2018-01-25 13:41, Alexander Smirnov wrote:
> On 01/25/2018 11:08 AM, Jan Kiszka wrote:
>> On 2018-01-24 19:32, Alexander Smirnov wrote:
>>> 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 <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.
>>>>
>>>
>>> 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.
>>
>> Perfect. Could you merge the final commit into next? I'd like to rework
>> the layer refactoring, and this will conflict.
> 
> 'example-hello' is in 'next'. Do you need 'libhello' now or it could wait?

I suppose the libhello changes will be affected by the refactoring as
well. But I won't be able to continue on this for the next hours anyway,
no need to hurry.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux