Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx1.pokylinux.org (Postfix) with ESMTP id 1B1514C81199 for ; Tue, 19 Oct 2010 09:22:54 -0500 (CDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 19 Oct 2010 07:22:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,350,1283756400"; d="scan'208";a="848680969" Received: from kyu3-hedt.bj.intel.com (HELO localhost) ([172.16.182.108]) by fmsmga001.fm.intel.com with ESMTP; 19 Oct 2010 07:22:53 -0700 From: ke.yu@intel.com To: yocto@yoctoproject.org Date: Tue, 19 Oct 2010 22:26:49 +0800 Message-Id: <1287498409-12928-2-git-send-email-ke.yu@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1287498409-12928-1-git-send-email-ke.yu@intel.com> References: <1287498409-12928-1-git-send-email-ke.yu@intel.com> Subject: [PATCH] sysklogd: correct the syslog link and conf file X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2010 14:22:54 -0000 From: Yu Ke This commit fix [BUGID #482] Two issues cause bug 482: - firsty, there are two version of syslog: sysklogd and busybox. the busybox one is directly installed as /etc/init.d/syslog, and the sysklogd one is installed by update-alternative. the update-alternative will thus fail because the /etc/init.d/syslog (busybox one) already exist and not a link. so the correct way is to install busybox one by update-alternative, the layout will be: /etc/init.d/syslog.busybox /etc/init.d/syslog.sysklogd /etc/init.d/syslog -> syslog.busybox or /etc/init.d/syslog -> syslog.sysklogd - secondly, sysklogd default conf is not comply with poky. Its dir /var/adm/ does not exist. Check the debian /etc/syslog.conf and find it is more sophiscated and suitable, so port /etc/syslog.conf from debian. Signed-off-by: Yu Ke --- meta/recipes-core/busybox/busybox.inc | 13 ++++- meta/recipes-core/busybox/busybox_1.16.2.bb | 2 +- meta/recipes-extended/sysklogd/files/syslog.conf | 70 ++++++++++++++++++++++ meta/recipes-extended/sysklogd/sysklogd.inc | 3 +- meta/recipes-extended/sysklogd/sysklogd_1.5.bb | 2 +- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/sysklogd/files/syslog.conf diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index b3c6c66..b8c009c 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -53,7 +53,7 @@ do_install () { # Move back the sh symlink test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ - install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then # Move crond back to /usr/sbin/crond @@ -107,6 +107,8 @@ pkg_postinst_${PN} () { # This adds the links, remember that this has to work when building an image too, hence the $D while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links + + update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 } pkg_prerm_${PN} () { @@ -138,4 +140,13 @@ pkg_prerm_${PN} () { bn=`basename $link` sh /usr/bin/update-alternatives --remove $bn $to done