Patchwork [meta-oe,v2] 20/22] busybox: remove unneeded systemd code

login
register
mail settings
Submitter Andreas Müller
Date Feb. 16, 2012, 2:03 a.m.
Message ID <1329357796-27398-21-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21325/
State Superseded, archived
Headers show

Comments

Andreas Müller - Feb. 16, 2012, 2:03 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/busybox/busybox_1.19.3.bbappend   |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
Otavio Salvador - Feb. 16, 2012, 10:08 a.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, Feb 16, 2012 at 00:03, Andreas Müller
<schnitzeltony@googlemail.com>wrote:

> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../recipes-core/busybox/busybox_1.19.3.bbappend   |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
> b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
> index 7e72a43..6b62bd7 100644
> --- a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
> +++ b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
> @@ -1,6 +1,6 @@
>  inherit systemd
>
> -PRINC := "${@int(PRINC) + 2}"
> +PRINC := "${@int(PRINC) + 3}"
>
>  # look for files in the layer first
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> @@ -15,7 +15,6 @@ SYSTEMD_SERVICE_${PN}-syslog-systemd =
> "busybox-syslog.service"
>  do_install_append() {
>        install -m 0644 ${WORKDIR}/busybox-syslog.default
> ${D}${sysconfdir}/default/busybox-syslog
>
> -       install -d ${D}${base_libdir}/systemd/system
>        sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/
> busybox-syslog.service.in \
>             > ${D}${base_libdir}/systemd/system/busybox-syslog.service
>        sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/
> busybox-klogd.service.in \
> @@ -24,7 +23,4 @@ do_install_append() {
>        ln -sf /dev/null ${D}${base_libdir}/systemd/system/syslog.service
>  }
>
> -PACKAGES += "${PN}-syslog-systemd"
> -
> -RDEPENDS_${PN}-syslog-systemd += "${PN}-syslog"
> -FILES_${PN}-syslog-systemd = "${base_libdir}/systemd"
> +FILES_${PN}-syslog-systemd +=
> "${base_libdir}/systemd/system/syslog.service"
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
index 7e72a43..6b62bd7 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
@@ -1,6 +1,6 @@ 
 inherit systemd
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -15,7 +15,6 @@  SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
 do_install_append() {
 	install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
 
-	install -d ${D}${base_libdir}/systemd/system
 	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
 	     > ${D}${base_libdir}/systemd/system/busybox-syslog.service
 	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
@@ -24,7 +23,4 @@  do_install_append() {
 	ln -sf /dev/null ${D}${base_libdir}/systemd/system/syslog.service
 }
 
-PACKAGES += "${PN}-syslog-systemd"
-
-RDEPENDS_${PN}-syslog-systemd += "${PN}-syslog"
-FILES_${PN}-syslog-systemd = "${base_libdir}/systemd"
+FILES_${PN}-syslog-systemd += "${base_libdir}/systemd/system/syslog.service"