Signed-off-by: Andreas Müller <[email protected]>
---
.../recipes-core/busybox/busybox_1.19.4.bbappend | 20 +---------------
.../busybox/busybox/busybox-klogd.service.in | 0
.../busybox/busybox/busybox-syslog.service.in | 0
.../recipes-core/busybox/busybox_1.19.4.bbappend | 23 ++++++++++++++++++++
4 files changed, 25 insertions(+), 18 deletions(-)
rename {meta-oe =>
meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-klogd.service.in
(100%)
rename {meta-oe =>
meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-syslog.service.in
(100%)
create mode 100644
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index 786e1d5..e9dd4ac 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,27 +1,11 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 4}"
+PRINC := "${@int(PRINC) + 5}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://busybox-syslog.service.in \
- file://busybox-klogd.service.in \
- file://busybox-syslog.default"
-
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SRC_URI += "file://busybox-syslog.default"
do_install_append() {
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default
${D}${sysconfdir}/default/busybox-syslog
-
- 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-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
similarity index 100%
rename from meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
rename to
meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
similarity index 100%
rename from meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
rename to
meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
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
new file mode 100644
index 0000000..a0ae2ce
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.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"
--
1.7.4.4
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
