Patchwork avahi: Remove unnecessary runtime dependency on sysvinit-pidof

login
register
mail settings
Submitter Shakeel, Muhammad
Date July 25, 2013, 10:02 a.m.
Message ID <1374746524-18179-1-git-send-email-muhammad_shakeel@mentor.com>
Download mbox | patch
Permalink /patch/54449/
State Accepted
Commit 159c1c8e46fcabe9b87fcd3e6e6812198e007bbd
Headers show

Comments

Shakeel, Muhammad - July 25, 2013, 10:02 a.m.
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>

'pidof' is alternatively coming from busybox so no need for avahi to explicitly
rdepend on sysvinit-pidof. This unnecessarily includes sysvinit in systemd only
build.

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
 meta/recipes-connectivity/avahi/avahi.inc |    2 --
 1 file changed, 2 deletions(-)
Paul Eggleton - July 25, 2013, 11:08 a.m.
On Thursday 25 July 2013 15:02:04 Shakeel, Muhammad wrote:
> From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> 
> 'pidof' is alternatively coming from busybox so no need for avahi to
> explicitly rdepend on sysvinit-pidof. This unnecessarily includes sysvinit
> in systemd only build.

Surely this just results in sysvinit being built as opposed to being included 
in the image?

Cheers,
Paul
Saul Wold - July 25, 2013, 4:43 p.m.
On 07/25/2013 03:02 AM, Shakeel, Muhammad wrote:
> From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
>
> 'pidof' is alternatively coming from busybox so no need for avahi to explicitly
> rdepend on sysvinit-pidof. This unnecessarily includes sysvinit in systemd only
> build.
>
> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> ---
>   meta/recipes-connectivity/avahi/avahi.inc |    2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index c302f87..7bb5381 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -96,8 +96,6 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
>   FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
>   FILES_avahi-utils = "${bindir}/avahi-*"
>
> -RDEPENDS_avahi-daemon = "sysvinit-pidof"
> -
I am sure there was a reason that the sysvinit version of pidof was 
required over the busybox, did you test that the busybox version works 
correctly in both systemd and sysvinit usages?

It maybe that the busybox version now work correctly.

Also as Paul pointed out, this is an RDEPENDS on a single package not 
all the sysvinit packages.

Sau!

>   # uclibc has no nss
>   RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
>   RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
>
Shakeel, Muhammad - July 30, 2013, 7:58 a.m.
On 07/25/2013 09:43 PM, Saul Wold wrote:
> On 07/25/2013 03:02 AM, Shakeel, Muhammad wrote:
>> -RDEPENDS_avahi-daemon = "sysvinit-pidof"
>> -
> I am sure there was a reason that the sysvinit version of pidof was 
> required over the busybox, did you test that the busybox version works 
> correctly in both systemd and sysvinit usages?
>
> It maybe that the busybox version now work correctly.
>
> Also as Paul pointed out, this is an RDEPENDS on a single package not 
> all the sysvinit packages.
>
> Sau!
>
I have tested that pidof from busybox works fine for both systemd and 
sysvinit and also avahi-daemon works fine with this.

Also sysvinit is rdepending on 'sysvinit-pidof' and for sysvinit systems 
pidof will always come from inside it. It is only systemd enabled 
systems which will get pidof from busybox and it seems to be working fine.

I have tried to track it that why this rdepend was added for avahi 
daemon. It was added back in May 2007 but commit 
(1641c2bd2c71bb08de7057b052ae74c00eedb330) message doesn't have any more 
detail. I am sure that pidof from busybox is much more stable now.

This is definitely installing only 'sysvinit-pidof' but I was of the 
opinion that if we can avoid all of sysvinit for systemd only build, 
given that it is not impacting any of the functionality, then it will be 
nice. IMHO, we should try to prevent as many unnecessary bits from 
build/image as possible.

Regards,
Shakeel

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index c302f87..7bb5381 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -96,8 +96,6 @@  FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 
-RDEPENDS_avahi-daemon = "sysvinit-pidof"
-
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
 RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"