From 1cd30e7929f3cdfd2d97db2888d1bcb5e165d546 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 5 Jul 2013 17:01:16 +0000
Subject: busybox: Follow OE-Core update to 1.12.1 version

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-core/busybox/busybox_1.20.2.bbappend   | 27 ----------------------
 .../recipes-core/busybox/busybox_1.21.1.bbappend   | 25 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
 create mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.bbappend

(limited to 'meta-systemd/oe-core')

diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
deleted file mode 100644
index bdba2db3c0..0000000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
+++ /dev/null
@@ -1,27 +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_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
new file mode 100644
index 0000000000..6362bdba65
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.21.1.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"
-- 
cgit 1.2.3-korg