Patchwork avahi: enable service when using systemd

login
register
mail settings
Submitter Koen Kooi
Date June 1, 2011, 2:22 p.m.
Message ID <1306938155-28804-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/5239/
State New, archived
Headers show

Comments

Koen Kooi - June 1, 2011, 2:22 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-connectivity/avahi/avahi.inc       |   20 +++++++++++++++++++-
 meta/recipes-connectivity/avahi/avahi_0.6.30.bb |    2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)
Koen Kooi - June 1, 2011, 2:25 p.m.
scratch that one, the RDEPENDS change makes it depend on meta-oe


Op 1 jun 2011, om 16:22 heeft Koen Kooi het volgende geschreven:

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-connectivity/avahi/avahi.inc       |   20 +++++++++++++++++++-
> meta/recipes-connectivity/avahi/avahi_0.6.30.bb |    2 +-
> 2 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 099c5a4..e631ac5 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -44,7 +44,25 @@ EXTRA_OECONF = "--with-distro=debian \
> PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
> 
> FILES_avahi-systemd = "${base_libdir}/systemd"
> -RDEPENDS_avahi-systemd = "avahi-daemon"
> +RDEPENDS_avahi-systemd = "avahi-daemon systemd"
> +
> +pkg_postinst_avahi-systemd() {
> +	# can't do this offline
> +	if [ "x$D" != "x" ]; then
> +		exit 1
> +	fi
> +	
> +	systemctl enable avahi-daemon.service
> +}
> +
> +pkg_postrm_avahi-systemd() {
> +	# can't do this offline
> +	if [ "x$D" != "x" ]; then
> +		exit 1
> +	fi
> +
> +	systemctl disable avahi-daemon.service
> +}
> 
> FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
> FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> index e63f406..9d10800 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
> 
> RDEPENDS_avahi-daemon = "sysvinit-pidof"
> -PR = "r1"
> +PR = "r2"
> 
> EXTRA_OECONF += "--disable-gtk3"
> 
> -- 
> 1.6.6.1
>
Saul Wold - June 3, 2011, 12:13 a.m.
On 06/01/2011 07:22 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/recipes-connectivity/avahi/avahi.inc       |   20 +++++++++++++++++++-
>   meta/recipes-connectivity/avahi/avahi_0.6.30.bb |    2 +-
>   2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 099c5a4..e631ac5 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -44,7 +44,25 @@ EXTRA_OECONF = "--with-distro=debian \
>   PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
>
>   FILES_avahi-systemd = "${base_libdir}/systemd"
> -RDEPENDS_avahi-systemd = "avahi-daemon"
> +RDEPENDS_avahi-systemd = "avahi-daemon systemd"
> +
> +pkg_postinst_avahi-systemd() {
> +	# can't do this offline
> +	if [ "x$D" != "x" ]; then
> +		exit 1
> +	fi
> +	
> +	systemctl enable avahi-daemon.service
> +}
> +
> +pkg_postrm_avahi-systemd() {
> +	# can't do this offline
> +	if [ "x$D" != "x" ]; then
> +		exit 1
> +	fi
> +
> +	systemctl disable avahi-daemon.service
> +}
>
>   FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
>   FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> index e63f406..9d10800 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>                       file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
>
>   RDEPENDS_avahi-daemon = "sysvinit-pidof"
> -PR = "r1"
> +PR = "r2"
>
>   EXTRA_OECONF += "--disable-gtk3"
>
Merged into oe-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 099c5a4..e631ac5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -44,7 +44,25 @@  EXTRA_OECONF = "--with-distro=debian \
 PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev"
 
 FILES_avahi-systemd = "${base_libdir}/systemd"
-RDEPENDS_avahi-systemd = "avahi-daemon"
+RDEPENDS_avahi-systemd = "avahi-daemon systemd"
+
+pkg_postinst_avahi-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	
+	systemctl enable avahi-daemon.service
+}
+
+pkg_postrm_avahi-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+
+	systemctl disable avahi-daemon.service
+}
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index e63f406..9d10800 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF += "--disable-gtk3"