From 6110c6b066f6b7668e2e228e762dd2825246215b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 3 Feb 2014 14:38:51 +0100 Subject: busybox: rename .bbappend to match new version from oe-core Signed-off-by: Martin Jansa --- .../recipes-core/busybox/busybox_%.bbappend | 25 ++++++++++++++++++++++ .../recipes-core/busybox/busybox_1.21.1.bbappend | 25 ---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.bbappend (limited to 'meta-systemd') diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend new file mode 100644 index 0000000000..6362bdba65 --- /dev/null +++ b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend @@ -0,0 +1,25 @@ +inherit systemd + +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://busybox-syslog.service.in \ + file://busybox-klogd.service.in" + +SYSTEMD_PACKAGES = "${PN}-syslog" +SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ + > ${D}${systemd_unitdir}/system/busybox-syslog.service + sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ + > ${D}${systemd_unitdir}/system/busybox-klogd.service + + ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service +} +FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service" + +RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd" +RREPLACES_${PN}-syslog += "${PN}-syslog-systemd" +RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd" diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.bbappend deleted file mode 100644 index 6362bdba65..0000000000 --- a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -inherit systemd - -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://busybox-syslog.service.in \ - file://busybox-klogd.service.in" - -SYSTEMD_PACKAGES = "${PN}-syslog" -SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ - > ${D}${systemd_unitdir}/system/busybox-syslog.service - sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ - > ${D}${systemd_unitdir}/system/busybox-klogd.service - - ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service -} -FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service" - -RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd" -RREPLACES_${PN}-syslog += "${PN}-syslog-systemd" -RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd" -- cgit 1.2.3-korg