Skip to contentSkip to conversation

sklogd: correct the syslog link and conf file (bug 482)

GIT PULL New [email protected] 2 participants 3 messages Oct 19, 2010

lore
Share & tools
lore
#0 lore raw
 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(-)

Yu Ke (1):
sysklogd: correct the syslog link and conf file

Pull URL: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug482

#1 lore raw

PATCH 1/1 sysklogd: correct the syslog link and conf file

From: Yu Ke <[email protected]>

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.

---
 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
meta/recipes-core/busybox/busybox.inc +12 -1
index b3c6c66..b8c009c 100644
@@ -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 </etc/busybox.links
+
+	# remove syslog
+	if test "x$D" = "x"; then
+		if test "$1" = "upgrade" -o "$1" = "remove"; then
+			/etc/init.d/syslog stop
+		fi
+	fi
+
+	update-alternatives --remove syslog-init syslog.${PN}
 }
meta/recipes-core/busybox/busybox_1.16.2.bb +1 -1
index 0952f4d..80dbeab 100644
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
meta/recipes-extended/sysklogd/files/syslog.conf new file +70 -0

70 lines not on this page · raw message

meta/recipes-extended/sysklogd/sysklogd.inc +2 -1
index 76ab707..9bd7728 100644
@@ -18,6 +18,7 @@ RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none
 SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
            file://no-strip-install.patch \
            file://sysklogd \
+           file://syslog.conf \
            "
 
 INITSCRIPT_NAME = "syslog"
@@ -33,7 +34,7 @@ do_install () {
 	mv ${D}${base_sbindir}/syslogd ${D}${base_sbindir}/syslogd.${PN}
 	mv ${D}${base_sbindir}/klogd ${D}${base_sbindir}/klogd.${PN}
 	install -d ${D}${sysconfdir}
-	install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf
+	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf
 	install -d ${D}${sysconfdir}/init.d
 	install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog.${PN}
 }
meta/recipes-extended/sysklogd/sysklogd_1.5.bb +1 -1
index 8344e27..27146c7 100644
@@ -1,2 +1,2 @@
 require sysklogd.inc
-PR = "r0"
+PR = "r1"
Signature · 1 line
1.7.0.4
#2 lore raw
In reply to [email protected]
Quoted 11 lines · On Tue, 2010-10-19 at 22:26 +0800, [email protected] wrote:

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(-)

Yu Ke (1):
sysklogd: correct the syslog link and conf file

Pull URL: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug482

Merged into master, thanks.

Richard