From 34060697fc5c99d05fa63528df9c99a7f5bd4eb1 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Sat, 9 Mar 2013 22:38:24 +0100 Subject: [PATCH] busybox: update recipe for new systemd.bbclass --- .../recipes-core/busybox/busybox_1.20.2.bbappend | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-opendreambox/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-opendreambox/recipes-core/busybox/busybox_1.20.2.bbappend index 167f131b..0fcc7f08 100644 --- a/meta-opendreambox/recipes-core/busybox/busybox_1.20.2.bbappend +++ b/meta-opendreambox/recipes-core/busybox/busybox_1.20.2.bbappend @@ -14,14 +14,18 @@ do_install_append() { if grep -q "CONFIG_CRONTAB=y" ${WORKDIR}/defconfig; then install -d ${D}${sysconfdir}/cron/crontabs fi - install -d ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/busybox-telnetd.service + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + ln -sf /dev/null ${D}${systemd_unitdir}/system/busybox-telnetd.service + install -m644 ${WORKDIR}/busybox-telnetd@.service ${D}${systemd_unitdir}/system + install -m644 ${WORKDIR}/busybox-telnetd.socket ${D}${systemd_unitdir}/system + fi } FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" -SYSTEMD_PACKAGES += "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "busybox-telnetd.socket" +SYSTEMD_PACKAGES += "${PN}" +SYSTEMD_SERVICE_${PN} = "busybox-telnetd.socket" XINETD_PACKAGES = "${PN}-xinetd" XINETD_SERVICE_${PN}-xinetd = "busybox-telnetd" -- 2.20.1