Patchwork avahi: fix systemd service packaging with multilib

login
register
mail settings
Submitter Ross Burton
Date April 18, 2013, 5:33 p.m.
Message ID <1366306413-1336-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/48527/
State New
Headers show

Comments

Ross Burton - April 18, 2013, 5:33 p.m.
Move the systemd class usage to the .inc, and use ${PN} correctly so that
the files are packaged in multilib configurations.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/avahi/avahi.inc       |    6 +++++-
 meta/recipes-connectivity/avahi/avahi_0.6.31.bb |    6 ------
 2 files changed, 5 insertions(+), 7 deletions(-)
Martin Jansa - April 18, 2013, 6:13 p.m.
Doesn't this break avahi-ui again?

http://git.openembedded.org/openembedded-core/commit/?id=02492d43cd7095acb3cf29843a50444c28b4d994


On Thu, Apr 18, 2013 at 7:33 PM, Ross Burton <ross.burton@intel.com> wrote:

> Move the systemd class usage to the .inc, and use ${PN} correctly so that
> the files are packaged in multilib configurations.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-connectivity/avahi/avahi.inc       |    6 +++++-
>  meta/recipes-connectivity/avahi/avahi_0.6.31.bb |    6 ------
>  2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc
> b/meta/recipes-connectivity/avahi/avahi.inc
> index c302f87..f31b5e5 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -37,7 +37,7 @@ USERADD_PARAM_avahi-autoipd = "--system --home
> /var/run/avahi-autoipd \
>                                -c \"Avahi autoip daemon\" \
>                                avahi-autoipd"
>
> -inherit autotools pkgconfig update-rc.d gettext useradd
> +inherit autotools pkgconfig update-rc.d gettext useradd systemd
>
>  EXTRA_OECONF = "--disable-introspection \
>               --with-avahi-priv-access-group=adm \
> @@ -115,6 +115,10 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
>  INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
>  INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
>
> +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> +SYSTEMD_SERVICE_${PN}-daemon = "avahi-daemon.service"
> +SYSTEMD_SERVICE_${PN}-dnsconfd = "avahi-dnsconfd.service"
> +
>  do_install() {
>         autotools_do_install
>
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bbb/meta/recipes-connectivity/avahi/
> avahi_0.6.31.bb
> index 22731f9..cff0974 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> @@ -1,11 +1,5 @@
>  require avahi.inc
>
> -inherit systemd
> -
> -SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> -SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> -SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> -
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>
>  file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d
> \
>
>  file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> --
> 1.7.10.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Ross Burton - April 18, 2013, 6:17 p.m.
On 18 April 2013 19:13, Martin Jansa <martin.jansa@gmail.com> wrote:
> Doesn't this break avahi-ui again?
>
> http://git.openembedded.org/openembedded-core/commit/?id=02492d43cd7095acb3cf29843a50444c28b4d994

Yes, it will, sorry.  Then again why does avahi-ui use avahi.inc,
considering the bulk of the include doesn't actually apply.

(new patch coming tomorrow, I'm about to get off this train)

Ross

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index c302f87..f31b5e5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -37,7 +37,7 @@  USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
                               -c \"Avahi autoip daemon\" \
                               avahi-autoipd"
 
-inherit autotools pkgconfig update-rc.d gettext useradd
+inherit autotools pkgconfig update-rc.d gettext useradd systemd
 
 EXTRA_OECONF = "--disable-introspection \
              --with-avahi-priv-access-group=adm \
@@ -115,6 +115,10 @@  INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
 INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
+SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
+SYSTEMD_SERVICE_${PN}-daemon = "avahi-daemon.service"
+SYSTEMD_SERVICE_${PN}-dnsconfd = "avahi-dnsconfd.service"
+
 do_install() {
 	autotools_do_install
 
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index 22731f9..cff0974 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -1,11 +1,5 @@ 
 require avahi.inc
 
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
-SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
-SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
-
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
                     file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \