From ea50866e0c7faf65ab91f5ce1b5d3fd93ad38e40 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 24 Aug 2012 07:23:38 +0000 Subject: busybox/meta-systemd: follow oe-core to 1.20.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- .../recipes-core/busybox/busybox_1.19.4.bbappend | 23 ---------------------- .../recipes-core/busybox/busybox_1.20.2.bbappend | 23 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend create mode 100644 meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend deleted file mode 100644 index bb1155074f..0000000000 --- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 3}" - -# 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" -SYSTEMD_SERVICE_${PN}-syslog-systemd = "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 = "${systemd_unitdir}/system/syslog.service" diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend new file mode 100644 index 0000000000..a0ae2ce186 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend @@ -0,0 +1,23 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 1}" + +# 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" +SYSTEMD_SERVICE_${PN}-syslog-systemd = "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 = "${systemd_unitdir}/system/syslog.service" -- cgit v1.2.3-54-g00ecf