[meta-ivi] [PATCH] connman: delete init scripts if 'sysvinit' feature is enabled

[meta-ivi] [PATCH] connman: delete init scripts if 'sysvinit' feature is enabled

[Sergey Matyukevich]

connman bbappend: delete init scripts if 'sysvinit' feature is enabled

Connman init scripts are installed only if 'sysvinit' feature is enabled
in DISTRO_FEATURES: see commit 7c8160ccbe17d6e10bd7a09b91843182a89b9055 in
poky.

Signed-off-by: Sergey Matyukevich <sergey_matyukevich@mentor.com>
---
 recipes-connectivity/connman/connman_1.15.bbappend |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-connectivity/connman/connman_1.15.bbappend b/recipes-connectivity/connman/connman_1.15.bbappend
index cda612b..236f244 100644
--- a/recipes-connectivity/connman/connman_1.15.bbappend
+++ b/recipes-connectivity/connman/connman_1.15.bbappend
@@ -4,6 +4,8 @@ INITSCRIPT_NAME = ""
 INITSCRIPT_PARAMS = ""
 
 do_install_append() {
-	# Remove init scripts
-	rm -r ${D}${sysconfdir}/init.d
+    if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+        # Remove init scripts
+        rm -r ${D}${sysconfdir}/init.d
+    fi
 }
-- 
1.7.2.5

Re: [meta-ivi] [PATCH] connman: delete init scripts if 'sysvinit' feature is enabled

[Burton, Ross]

On 3 July 2013 12:28, Sergey Matyukevich <sergey_matyukevich@mentor.com> wrote:
> connman bbappend: delete init scripts if 'sysvinit' feature is enabled
>
> Connman init scripts are installed only if 'sysvinit' feature is enabled
> in DISTRO_FEATURES: see commit 7c8160ccbe17d6e10bd7a09b91843182a89b9055 in
> poky.
>
> Signed-off-by: Sergey Matyukevich <sergey_matyukevich@mentor.com>

I'm curious as to why you're deleting the connman init scripts in meta-ivi...

Ross

[meta-ivi] [PATCHv2] connman: do not delete init scripts in bbappend

[Sergey Matyukevich]

>> Connman init scripts are installed only if 'sysvinit' feature is enabled
>> in DISTRO_FEATURES: see commit 7c8160ccbe17d6e10bd7a09b91843182a89b9055 in
>> poky.
>>
>> Signed-off-by: Sergey Matyukevich<sergey_matyukevich@mentor.com>
>
> I'm curious as to why you're deleting the connman init scripts in meta-ivi...
>
> Ross

Hmm... Thanks for comment. It is good idea to take a break and to see 
the forest for the trees. Here is the second patch revision.

Connman init scripts are now installed only when 'sysvinit' feature is
enabled in DISTRO_FEATURES: commit 
7c8160ccbe17d6e10bd7a09b91843182a89b9055 in
poky. No need to remove them in bbappend: they are not installed for 
'systemd'-enabled
systems and they are needed for 'sysvinit'-enabled systems.

Signed-off-by: Sergey Matyukevich <sergey_matyukevich@mentor.com>
---
  recipes-connectivity/connman/connman_1.15.bbappend |    5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/recipes-connectivity/connman/connman_1.15.bbappend 
b/recipes-connectivity/connman/connman_1.15.bbappend
index cda612b..83e4b51 100644
--- a/recipes-connectivity/connman/connman_1.15.bbappend
+++ b/recipes-connectivity/connman/connman_1.15.bbappend
@@ -2,8 +2,3 @@ PRINC := "${@int(PRINC) + 2}"

  INITSCRIPT_NAME = ""
  INITSCRIPT_PARAMS = ""
-
-do_install_append() {
-	# Remove init scripts
-	rm -r ${D}${sysconfdir}/init.d
-}
-- 
1.7.2.5

Re: [meta-ivi] [PATCHv2] connman: do not delete init scripts in bbappend

[Burton, Ross]

On 3 July 2013 12:59, Sergey Matyukevich <Sergey_Matyukevich@mentor.com> wrote:
> Hmm... Thanks for comment. It is good idea to take a break and to see the
> forest for the trees. Here is the second patch revision.
>
> Connman init scripts are now installed only when 'sysvinit' feature is
> enabled in DISTRO_FEATURES: commit 7c8160ccbe17d6e10bd7a09b91843182a89b9055
> in
> poky. No need to remove them in bbappend: they are not installed for
> 'systemd'-enabled
> systems and they are needed for 'sysvinit'-enabled systems.
>
> Signed-off-by: Sergey Matyukevich <sergey_matyukevich@mentor.com>
> ---
>  recipes-connectivity/connman/connman_1.15.bbappend |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/recipes-connectivity/connman/connman_1.15.bbappend
> b/recipes-connectivity/connman/connman_1.15.bbappend
> index cda612b..83e4b51 100644
> --- a/recipes-connectivity/connman/connman_1.15.bbappend
> +++ b/recipes-connectivity/connman/connman_1.15.bbappend
> @@ -2,8 +2,3 @@ PRINC := "${@int(PRINC) + 2}"
>
>  INITSCRIPT_NAME = ""
>  INITSCRIPT_PARAMS = ""
> -
> -do_install_append() {
> -       # Remove init scripts
> -       rm -r ${D}${sysconfdir}/init.d
> -}
> --
> 1.7.2.5

In that case, you can delete INITSCRIPT_NAME and INITSCRIPT_PARAMS too
surely.  Then all you're left is the PRINC, so you can delete that if
you don't care/are using the PR service, or delete that bbappend when
connman 1.16 is integrated.

Ross

Re: [meta-ivi] [PATCHv2] connman: do not delete init scripts in bbappend

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

On Wed, Jul 03, 2013 at 01:09:47PM +0100, Burton, Ross wrote:
> In that case, you can delete INITSCRIPT_NAME and INITSCRIPT_PARAMS too
> surely.  Then all you're left is the PRINC, so you can delete that if
> you don't care/are using the PR service, or delete that bbappend when
> connman 1.16 is integrated.

Using PR service isn't enough to keep binary feed sane after removing
PRINC.

PR service bumps least significant number in PKGR value. PRINC bumps
most significant (even from INC_PR when used).

INC_PR = "r1"
PR = "${INC_PR}.1"
PRINC := "${@int(PRINC) + 1}"
EXTENDPRAUTO = ".1"

PKGR = "r2.1.1"

After removing PRINC, EXTENDPRAUTO is bumped, but still PKGR is lower:

PKGR = "r1.1.2"

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-ivi] [PATCHv2] connman: do not delete init scripts in bbappend

[Behrens, Holger]

Hi,

> On 3 July 2013 12:59, Sergey Matyukevich
> <Sergey_Matyukevich@mentor.com> wrote:
> > Hmm... Thanks for comment. It is good idea to take a break and to see the
> > forest for the trees. Here is the second patch revision.
> >
> > Connman init scripts are now installed only when 'sysvinit' feature is
> > enabled in DISTRO_FEATURES: commit
> 7c8160ccbe17d6e10bd7a09b91843182a89b9055
> > in
> > poky. No need to remove them in bbappend: they are not installed for
> > 'systemd'-enabled
> > systems and they are needed for 'sysvinit'-enabled systems.
> >
> > Signed-off-by: Sergey Matyukevich <sergey_matyukevich@mentor.com>
> > ---
> >  recipes-connectivity/connman/connman_1.15.bbappend |    5 -----
> >  1 files changed, 0 insertions(+), 5 deletions(-)
> >
> > diff --git a/recipes-connectivity/connman/connman_1.15.bbappend
> > b/recipes-connectivity/connman/connman_1.15.bbappend
> > index cda612b..83e4b51 100644
> > --- a/recipes-connectivity/connman/connman_1.15.bbappend
> > +++ b/recipes-connectivity/connman/connman_1.15.bbappend
> > @@ -2,8 +2,3 @@ PRINC := "${@int(PRINC) + 2}"
> >
> >  INITSCRIPT_NAME = ""
> >  INITSCRIPT_PARAMS = ""
> > -
> > -do_install_append() {
> > -       # Remove init scripts
> > -       rm -r ${D}${sysconfdir}/init.d
> > -}
> > --
> > 1.7.2.5
> 
> In that case, you can delete INITSCRIPT_NAME and INITSCRIPT_PARAMS too
> surely.  Then all you're left is the PRINC, so you can delete that if
> you don't care/are using the PR service, or delete that bbappend when
> connman 1.16 is integrated.

I agree that we could now start with the clean-up of the meta-ivi layer, given the fact that systemd is now supported by oe-core.  Which makes this .bbappend obsolete. And so agree with Ross to "delete that bbappend when connman 1.16 is integrated".  I created a card [1] and added it to the "Next Up" stack in Trello, so that we don't forget.

Regards,
Holger

[1] https://trello.com/c/bmWpT6lU

Re: [meta-ivi] [PATCHv2] connman: do not delete init scripts in bbappend

[Sergey Matyukevich]

Hi,

On 07/03/2013 04:38 PM, Behrens, Holger wrote:
> Hi,
>
>> On 3 July 2013 12:59, Sergey Matyukevich
>> <Sergey_Matyukevich@mentor.com>  wrote:
>>> Hmm... Thanks for comment. It is good idea to take a break and to see the
>>> forest for the trees. Here is the second patch revision.
>>>
>>> Connman init scripts are now installed only when 'sysvinit' feature is
>>> enabled in DISTRO_FEATURES: commit
>> 7c8160ccbe17d6e10bd7a09b91843182a89b9055
>>> in
>>> poky. No need to remove them in bbappend: they are not installed for
>>> 'systemd'-enabled
>>> systems and they are needed for 'sysvinit'-enabled systems.
>>>
>>> Signed-off-by: Sergey Matyukevich<sergey_matyukevich@mentor.com>
>>> ---
>>>   recipes-connectivity/connman/connman_1.15.bbappend |    5 -----
>>>   1 files changed, 0 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/recipes-connectivity/connman/connman_1.15.bbappend
>>> b/recipes-connectivity/connman/connman_1.15.bbappend
>>> index cda612b..83e4b51 100644
>>> --- a/recipes-connectivity/connman/connman_1.15.bbappend
>>> +++ b/recipes-connectivity/connman/connman_1.15.bbappend
>>> @@ -2,8 +2,3 @@ PRINC := "${@int(PRINC) + 2}"
>>>
>>>   INITSCRIPT_NAME = ""
>>>   INITSCRIPT_PARAMS = ""
>>> -
>>> -do_install_append() {
>>> -       # Remove init scripts
>>> -       rm -r ${D}${sysconfdir}/init.d
>>> -}
>>> --
>>> 1.7.2.5
>>
>> In that case, you can delete INITSCRIPT_NAME and INITSCRIPT_PARAMS too
>> surely.  Then all you're left is the PRINC, so you can delete that if
>> you don't care/are using the PR service, or delete that bbappend when
>> connman 1.16 is integrated.
>
> I agree that we could now start with the clean-up of the meta-ivi layer, given the fact that systemd is now supported by oe-core.  Which makes this .bbappend obsolete. And so agree with Ross to "delete that bbappend when connman 1.16 is integrated".  I created a card [1] and added it to the "Next Up" stack in Trello, so that we don't forget.
>
> Regards,
> Holger
>
> [1] https://trello.com/c/bmWpT6lU

Does it make sense to fix the current connman bbappend which is going to 
be in use for a while ? In its current state it affects distros which 
enable 'systemd' feature and disable 'sysvinit'. One of the following 
two options can be chosen. The first one was finalized in this thread:

diff --git a/recipes-connectivity/connman/connman_1.15.bbappend 
b/recipes-connectivity/connman/connman_1.15.bbappend
index cda612b..f1deaf2 100644
--- a/recipes-connectivity/connman/connman_1.15.bbappend
+++ b/recipes-connectivity/connman/connman_1.15.bbappend
@@ -1,9 +1 @@
  PRINC := "${@int(PRINC) + 2}"
-
-INITSCRIPT_NAME = ""
-INITSCRIPT_PARAMS = ""
-
-do_install_append() {
-       # Remove init scripts
-       rm -r ${D}${sysconfdir}/init.d
-}


There is also another [minimalistic and failsafe] option:

diff --git a/recipes-connectivity/connman/connman_1.15.bbappend 
b/recipes-connectivity/connman/connman_1.15.bbappend
index cda612b..2e5f355 100644
--- a/recipes-connectivity/connman/connman_1.15.bbappend
+++ b/recipes-connectivity/connman/connman_1.15.bbappend
@@ -5,5 +5,5 @@ INITSCRIPT_PARAMS = ""

  do_install_append() {
         # Remove init scripts
-       rm -r ${D}${sysconfdir}/init.d
+       rm -rf ${D}${sysconfdir}/init.d
  }

Thanks,
Sergey