* [PATCH] hello: Rename to example-hello
@ 2018-01-24 18:12 Alexander Smirnov
2018-01-24 18:16 ` Jan Kiszka
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Alexander Smirnov @ 2018-01-24 18:12 UTC (permalink / raw)
To: isar-users; +Cc: Alexander Smirnov
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] hello: Rename to example-hello
2018-01-24 18:12 [PATCH] hello: Rename to example-hello Alexander Smirnov
@ 2018-01-24 18:16 ` Jan Kiszka
2018-01-24 18:32 ` Alexander Smirnov
2018-01-25 10:52 ` Baurzhan Ismagulov
2018-01-29 16:26 ` Henning Schild
2 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2018-01-24 18:16 UTC (permalink / raw)
To: Alexander Smirnov, isar-users
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] hello: Rename to example-hello
2018-01-24 18:16 ` Jan Kiszka
@ 2018-01-24 18:32 ` Alexander Smirnov
2018-01-25 8:08 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Smirnov @ 2018-01-24 18:32 UTC (permalink / raw)
To: Jan Kiszka, isar-users
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.
Alex
>> +
>> +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
>>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] hello: Rename to example-hello
2018-01-24 18:32 ` Alexander Smirnov
@ 2018-01-25 8:08 ` Jan Kiszka
2018-01-25 12:41 ` Alexander Smirnov
0 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2018-01-25 8:08 UTC (permalink / raw)
To: Alexander Smirnov, isar-users
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.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] hello: Rename to example-hello
2018-01-25 8:08 ` Jan Kiszka
@ 2018-01-25 12:41 ` Alexander Smirnov
2018-01-25 12:52 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Smirnov @ 2018-01-25 12:41 UTC (permalink / raw)
To: Jan Kiszka, isar-users
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?
Alex
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] hello: Rename to example-hello
2018-01-25 12:41 ` Alexander Smirnov
@ 2018-01-25 12:52 ` Jan Kiszka
0 siblings, 0 replies; 8+ messages in thread
From: Jan Kiszka @ 2018-01-25 12:52 UTC (permalink / raw)
To: Alexander Smirnov, isar-users
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] hello: Rename to example-hello
2018-01-24 18:12 [PATCH] hello: Rename to example-hello Alexander Smirnov
2018-01-24 18:16 ` Jan Kiszka
@ 2018-01-25 10:52 ` Baurzhan Ismagulov
2018-01-29 16:26 ` Henning Schild
2 siblings, 0 replies; 8+ messages in thread
From: Baurzhan Ismagulov @ 2018-01-25 10:52 UTC (permalink / raw)
To: isar-users
On Wed, Jan 24, 2018 at 09:12:16PM +0300, 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>
I suggest the following changes:
* "Pure Debian contains already contains" -> "Pure Debian already contains".
* "keep cannonical names for Isar examples" -> "keep uniform naming for Isar
examples".
Acked-by: Baurzhan Ismagulov <ibr@ilbers.de>
With kind regards,
Baurzhan.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] hello: Rename to example-hello
2018-01-24 18:12 [PATCH] hello: Rename to example-hello Alexander Smirnov
2018-01-24 18:16 ` Jan Kiszka
2018-01-25 10:52 ` Baurzhan Ismagulov
@ 2018-01-29 16:26 ` Henning Schild
2 siblings, 0 replies; 8+ messages in thread
From: Henning Schild @ 2018-01-29 16:26 UTC (permalink / raw)
To: Alexander Smirnov; +Cc: isar-users
Am Wed, 24 Jan 2018 21:12:16 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:
> 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'.
In fact Isar needs to be able to deal with such collisions, imagine a
build where you ship a custom libc. There is no way you could change
all packages to depend on "example-libc". Packages from the Isar-apt
repo need to win in apt-get and multiconfig.
For the introduction of libhello i would talk to the maintainer whether
this would also be an interesting upstream feature to demonstrate deps
in debian itself.
Henning
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-01-29 16:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-24 18:12 [PATCH] hello: Rename to example-hello Alexander Smirnov
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox