[oe] [PATCH] busybox: move syslog config to /etc/default

[Martin Jansa]

On Wed, Jan 12, 2011 at 2:43 AM, Chris Larson <kergoth at gmail.com> wrote:
> From: Chris Larson <chris_larson at mentor.com>
>
> The busybox syslog syslog.conf is parsed by the /etc/init.d script, not by the
> syslog process itself, so it belongs in /etc/default.  In addition, the file
> format is *completely* different from the standard sysklogd configuration, so
> while we should resolve the file conflict between busybox-syslog and sysklogd,
> we should not use update-alternatives for it, so this is a cleaner solution.
>
> Signed-off-by: Chris Larson <chris_larson at mentor.com>
> ---
>  recipes/busybox/busybox.inc  |   13 +++++++++----
>  recipes/busybox/files/syslog |    4 ++--
>  2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index a9d1e6e..1106910 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -11,7 +11,7 @@ LICENSE = "GPLv2"
>  SECTION = "base"
>  PRIORITY = "required"
>
> -INC_PR = "r38"
> +INC_PR = "r39"
>
>  SRC_URI = "\
>   file://busybox-cron \
> @@ -47,7 +47,8 @@ RDEPENDS_${PN} += "${PN}-mountall"
>  RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
>
>  FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} ${sysconfdir}/syslog.conf"
> +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
> +                      ${sysconfdir}/default/syslog"
>  FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
>
>  FILES_${PN} += "${datadir}/udhcpc"
> @@ -58,7 +59,7 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-udhcpd"
>  INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
>  INITSCRIPT_NAME_${PN}-syslog = "syslog"
>  INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
> +CONFFILES_${PN}-syslog = "${sysconfdir}/default/syslog"
>
>  # This disables the syslog startup links in slugos (see slugos-init)
>  INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
> @@ -168,7 +169,11 @@ do_install () {
>
>        if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
>                install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
> -               install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
> +               sed -i -e 's,/etc/default/syslog,${sysconfdir}/default/syslog,' \
> +                   ${D}${sysconfdir}/init.d/syslog.${PN}

Hi,

Here it's right but to OE you've pushed version of patch where it is
also renamed to
default/busybox-syslog, but that patern in sed call
's,/etc/default/busybox-syslog,' should still read
's,/etc/default/syslog,', otherwise nothing is replaced and
syslog.busybox is still trying to read /etc/default/syslog which does
not exist

or rename it to busybox-syslog in files/syslog file too
http://git.openembedded.org/cgit.cgi/openembedded/commit/recipes/busybox/files/syslog?id=a25c0750c7892990c59e8d6048b8c4d99410bcee

Regards,

+	        sed -i -e
's,/etc/default/busybox-syslog,${sysconfdir}/default/busybox-syslog,'
\
+	            ${D}${sysconfdir}/init.d/syslog.${PN}

> +


> +               install -d ${D}${sysconfdir}/default
> +               install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/default/syslog
>        fi
>        if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
>                install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
> diff --git a/recipes/busybox/files/syslog b/recipes/busybox/files/syslog
> index 61d273b..6e86346 100644
> --- a/recipes/busybox/files/syslog
> +++ b/recipes/busybox/files/syslog
> @@ -5,8 +5,8 @@
>  #               Configuration file added by <bruno.randolf at 4g-systems.biz>
>  set -e
>
> -if [ -f /etc/syslog.conf ]; then
> -       . /etc/syslog.conf
> +if [ -f /etc/default/syslog ]; then
> +       . /etc/default/syslog
>        LOG_LOCAL=0
>        LOG_REMOTE=0
>        for D in $DESTINATION; do
> --
> 1.7.2.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>