[oe-commits] org.oe.dev logrotate 3.7.1: Eliminated hard coded paths, removed recommendation of gzip

[hillct-oe commit]

logrotate 3.7.1: Eliminated hard coded paths, removed recommendation of gzip
since it's typically provided by busybox which we can expect to always be
present. Also added proper config file specification. Closes #2014.

Author: hillct-oe at pinnacledigital.com
Branch: org.openembedded.dev
Revision: 4b0ecf8b99b73f1af0da8356e51642c2979ce27e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4b0ecf8b99b73f1af0da8356e51642c2979ce27e
Files:
1
packages/logrotate/logrotate_3.7.1.bb
Diffs:

#
# mt diff -r642d13b0e25d042544d4bc6f512daff448a3a45c -r4b0ecf8b99b73f1af0da8356e51642c2979ce27e
#
# 
# 
# patch "packages/logrotate/logrotate_3.7.1.bb"
#  from [e818895d242679e2e23f11af85357b6e7240f092]
#    to [6b44f659b0092c26f547f38234ce07491ee95e22]
# 
============================================================
--- packages/logrotate/logrotate_3.7.1.bb	e818895d242679e2e23f11af85357b6e7240f092
+++ packages/logrotate/logrotate_3.7.1.bb	6b44f659b0092c26f547f38234ce07491ee95e22
@@ -1,12 +1,11 @@ RCONFLICTS = "logrotate-script"
 DESCRIPTION = "Rotates, compresses, removes and mails system log files"
 HOMEPAGE = "http://packages.debian.org/unstable/admin/logrotate"
 RCONFLICTS = "logrotate-script"
-RRECOMMENDS = "gzip"
 DEPENDS = "popt"
 RDEPENDS = "cron"
 SECTION = "admin"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \
 	   file://logrotate-3.7.1.patch;patch=1 \
@@ -22,18 +21,20 @@ do_install () {
 
 do_install () {
     # Install the binary and conf file
-    install -D -s -m 0755 ${WORKDIR}/logrotate-${PV}/logrotate ${D}${base_sbindir}/logrotate
+    install -D -s -m 0755 ${S}/logrotate ${D}${base_sbindir}/logrotate
     install -D -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/logrotate.conf
     install -m 0755 -d ${D}${sysconfdir}/logrotate.d
 }
 
 pkg_postinst () {
     # Add the logrotate line to /etc/crontab
-    grep -q "/sbin/logrotate" ${sysconfdir}/crontab || echo "*/5 * * * *   /sbin/logrotate /etc/logrotate.conf" >> ${sysconfdir}/crontab
+    grep -q "${base_sbindir}/logrotate" ${sysconfdir}/crontab || echo "*/5 * * * *   ${base_sbindir}/logrotate ${sysconfdir}/logrotate.conf" >> ${sysconfdir}/crontab
 }
 
 pkg_postrm() {
     # Remove the logrotate line from /etc/crontab
-    grep -v /sbin/logrotate ${sysconfdir}/crontab > ${sysconfdir}/crontab.no-${PF}
+    grep -v ${base_sbindir}/logrotate ${sysconfdir}/crontab > ${sysconfdir}/crontab.no-${PF}
     mv ${sysconfdir}/crontab.no-${PF} ${sysconfdir}/crontab
 }
+
+CONFFILES += "${sysconfdir}/logrotate.conf"