[oe] [meta-networking][PATCH] dnsmasq: don't expect systemd support to be set
Joe MacDonald
Joe.MacDonald at windriver.com
Mon Aug 12 11:28:49 UTC 2013
Hey Mark,
[[meta-networking][PATCH] dnsmasq: don't expect systemd support to be set] On 13.08.10 (Sat 22:10) Mark Asselstine wrote:
> If you don't have 'systemd' set in your DISTRO_FEATURES 'dnsmasq' will
> fail to package due to a QA error;
>
> ERROR: QA Issue: dnsmasq: Files/directories were installed but not shipped
> /lib
>
> Check for systemd in DISTRO_FEATURES before performing installation
> instructions related to systemd.
>
> Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> ---
> meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> index 0f5b273..b9e7ff6 100644
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
> @@ -31,8 +31,10 @@ do_install () {
> install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
> install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
>
> - install -d ${D}${systemd_unitdir}/system
> - install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
> + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
> + install -d ${D}${systemd_unitdir}/system
> + install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
> + fi
>
> if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
> install -d ${D}${sysconfdir}/dbus-1/system.d
My first reaction to this was we just had it fixed in oe-core quite
recently, but Martin identified a condition that's not covered (yet) in
the oe-core fix. That said, I'm going to wait for the oe-core fix,
since right now I'd rather weed out any systemd on/off handling in
meta-networking.
--
-Joe MacDonald.
:wq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130812/b72d2620/attachment-0002.sig>
More information about the Openembedded-devel
mailing list