<div dir="ltr">Doesn&#39;t this break avahi-ui again?<div><br></div><div><a href="http://git.openembedded.org/openembedded-core/commit/?id=02492d43cd7095acb3cf29843a50444c28b4d994">http://git.openembedded.org/openembedded-core/commit/?id=02492d43cd7095acb3cf29843a50444c28b4d994</a><br>
</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Apr 18, 2013 at 7:33 PM, Ross Burton <span dir="ltr">&lt;<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>&gt;</span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Move the systemd class usage to the .inc, and use ${PN} correctly so that<br>
the files are packaged in multilib configurations.<br>
<br>
Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
---<br>
 meta/recipes-connectivity/avahi/avahi.inc       |    6 +++++-<br>
 meta/recipes-connectivity/avahi/<a href="http://avahi_0.6.31.bb" target="_blank">avahi_0.6.31.bb</a> |    6 ------<br>
 2 files changed, 5 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc<br>
index c302f87..f31b5e5 100644<br>
--- a/meta/recipes-connectivity/avahi/avahi.inc<br>
+++ b/meta/recipes-connectivity/avahi/avahi.inc<br>
@@ -37,7 +37,7 @@ USERADD_PARAM_avahi-autoipd = &quot;--system --home /var/run/avahi-autoipd \<br>
                               -c \&quot;Avahi autoip daemon\&quot; \<br>
                               avahi-autoipd&quot;<br>
<br>
-inherit autotools pkgconfig update-rc.d gettext useradd<br>
+inherit autotools pkgconfig update-rc.d gettext useradd systemd<br>
<br>
 EXTRA_OECONF = &quot;--disable-introspection \<br>
              --with-avahi-priv-access-group=adm \<br>
@@ -115,6 +115,10 @@ INITSCRIPT_PARAMS_avahi-daemon = &quot;defaults 21 19&quot;<br>
 INITSCRIPT_NAME_avahi-dnsconfd = &quot;avahi-dnsconfd&quot;<br>
 INITSCRIPT_PARAMS_avahi-dnsconfd = &quot;defaults 22 19&quot;<br>
<br>
+SYSTEMD_PACKAGES = &quot;${PN}-daemon ${PN}-dnsconfd&quot;<br>
+SYSTEMD_SERVICE_${PN}-daemon = &quot;avahi-daemon.service&quot;<br>
+SYSTEMD_SERVICE_${PN}-dnsconfd = &quot;avahi-dnsconfd.service&quot;<br>
+<br>
 do_install() {<br>
        autotools_do_install<br>
<br>
diff --git a/meta/recipes-connectivity/avahi/<a href="http://avahi_0.6.31.bb" target="_blank">avahi_0.6.31.bb</a> b/meta/recipes-connectivity/avahi/<a href="http://avahi_0.6.31.bb" target="_blank">avahi_0.6.31.bb</a><br>

index 22731f9..cff0974 100644<br>
--- a/meta/recipes-connectivity/avahi/<a href="http://avahi_0.6.31.bb" target="_blank">avahi_0.6.31.bb</a><br>
+++ b/meta/recipes-connectivity/avahi/<a href="http://avahi_0.6.31.bb" target="_blank">avahi_0.6.31.bb</a><br>
@@ -1,11 +1,5 @@<br>
 require avahi.inc<br>
<br>
-inherit systemd<br>
-<br>
-SYSTEMD_PACKAGES = &quot;${PN}-daemon ${PN}-dnsconfd&quot;<br>
-SYSTEMD_SERVICE_avahi-daemon = &quot;avahi-daemon.service&quot;<br>
-SYSTEMD_SERVICE_avahi-dnsconfd = &quot;avahi-dnsconfd.service&quot;<br>
-<br>
 LIC_FILES_CHKSUM = &quot;file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \<br>
                     file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \<br>
                     file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.10.4<br>
<br>
<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core" target="_blank">http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>