[oe-commits] Sergey Lapin : sysklogd: using proper binary locations and update-alternatives
git version control
git at git.openembedded.org
Mon Mar 22 19:25:21 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 12784ca2ec5786be5303773874431f2464187a16
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=12784ca2ec5786be5303773874431f2464187a16
Author: Sergey Lapin <slapin at ossfans.org>
Date: Mon Mar 22 18:34:23 2010 +0300
sysklogd: using proper binary locations and update-alternatives
---
recipes/sysklogd/sysklogd.inc | 18 ++++++++++++++++--
recipes/sysklogd/sysklogd_1.4.1.bb | 2 ++
recipes/sysklogd/sysklogd_1.5.bb | 2 +-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/recipes/sysklogd/sysklogd.inc b/recipes/sysklogd/sysklogd.inc
index 2fdc49c..5eb85a2 100644
--- 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
--- 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
--- 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"
More information about the Openembedded-commits
mailing list