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 <[email protected]> --- 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.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 \ -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
