sysklogd: using proper binary locations and update-alternatives

diff --git a/recipes/sysklogd/sysklogd.inc b/recipes/sysklogd/sysklogd.inc
index 2fdc49c..5eb85a2 100644 (file)
--- a/recipes/sysklogd/sysklogd.inc
+++ b/recipes/sysklogd/sysklogd.inc
@@ -6,11 +6,25 @@ SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz
           file://nonrootinstall.patch;patch=1"
 
 CFLAGS_append = " -DSYSV"
+RCONFLICTS = "busybox-syslog"
 
 do_install () {
        install -d ${D}${mandir}/man8 \
                   ${D}${mandir}/man5 \
-                  ${D}${bindir}
-       oe_runmake 'BINDIR=${D}${bindir}' \
+                  ${D}${base_sbindir}
+       oe_runmake 'BINDIR=${D}${base_sbindir}' \
                   'MANDIR=${D}${mandir}' 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
 }
+pkg_postinst_${PN} () {
+    update-alternatives --install ${base_sbindir}/syslogd syslogd syslogd.${PN} 100
+    update-alternatives --install ${base_sbindir}/klogd klogd klogd.${PN} 100
+}
+pkg_prerm_${PN} () {
+    update-alternatives --remove syslogd syslogd.${PN}
+    update-alternatives --remove klogd klogd.${PN}
+}
+

diff --git a/recipes/sysklogd/sysklogd_1.4.1.bb b/recipes/sysklogd/sysklogd_1.4.1.bb
index 31843d6..8596f93 100644 (file)
--- a/recipes/sysklogd/sysklogd_1.4.1.bb
+++ b/recipes/sysklogd/sysklogd_1.4.1.bb
@@ -1 +1,3 @@
 require sysklogd.inc
+PR = "r1"
+

diff --git a/recipes/sysklogd/sysklogd_1.5.bb b/recipes/sysklogd/sysklogd_1.5.bb
index 37cfd7f..ce2821f 100644 (file)
--- a/recipes/sysklogd/sysklogd_1.5.bb
+++ b/recipes/sysklogd/sysklogd_1.5.bb
@@ -1,4 +1,4 @@
 require sysklogd.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://no-strip-install.patch;patch=1"