logcheck: update to 1.3.18
PATCH v2 1/1 logcheck: update to 1.3.18
From: Jackie Huang <[email protected]>
Changes:
- logcheck should not be run as root, so inherit useradd and add proper user and group.
- Add missing runtime dependencies according to the file debian/control and simple test by running "logcheck -ot".
- For syslog, debian directly depends on rsyslog, but logcheck works with any syslog and we have busybox-syslog, sysklogd, syslog-ng and rsyslog, so use VIRTUAL-RUNTIME_syslog for the syslog dependency and set rsyslog as the default, which can be easily overridden in distro conf file or local.conf.
- Don't install /var/lock when populating rootfs. Do it through volatile.
- install header.txt for generated mails
---
.../recipes-extended/logcheck/files/99_logcheck | 2 +
.../{logcheck_1.3.17.bb => logcheck_1.3.18.bb} | 52 +++++++++++++++++++---
2 files changed, 49 insertions(+), 5 deletions(-)
create mode 100644 meta-oe/recipes-extended/logcheck/files/99_logcheck
rename meta-oe/recipes-extended/logcheck/{logcheck_1.3.17.bb => logcheck_1.3.18.bb} (45%)meta-oe/recipes-extended/logcheck/files/99_logcheck new file +2 -0
@@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d logcheck logcheck 0755 /var/lock/logcheck none
meta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +47 -5
72 lines not on this page · raw message
Signature · 1 line
2.11.0
Unfortunately it still fails even with RRECOMMENDS, try it without meta-perl.
Quoted 136 lines · On Wed, Aug 16, 2017 at 4:23 AM, <[email protected]> wrote:
From: Jackie Huang <[email protected]>
Changes:
- logcheck should not be run as root, so inherit useradd and add proper user and group.- Add missing runtime dependencies according to the file debian/control and simple test by running "logcheck -ot".
- For syslog, debian directly depends on rsyslog, but logcheck works with any syslog and we have busybox-syslog, sysklogd, syslog-ng and rsyslog, so use VIRTUAL-RUNTIME_syslog for the syslog dependency and set rsyslog as the default, which can be easily overridden in distro conf file or local.conf.
- Don't install
/var/lockwhen populating rootfs. Do it through volatile.- install header.txt for generated mails
Signed-off-by Jackie Huang <[email protected]>--- .../recipes-extended/logcheck/files/99_logcheck | 2 + .../{logcheck_1.3.17.bb => logcheck_1.3.18.bb} | 52 +++++++++++++++++++--- 2 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-extended/logcheck/files/99_logcheck rename meta-oe/recipes-extended/logcheck/{logcheck_1.3.17.bb =>logcheck_1.3.18.bb} (45%)
meta-oe/recipes-extended/logcheck/files/99_logcheck new file +2
-0@@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d logcheck logcheck 0755 /var/lock/logcheck nonemeta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +11
-2@@ -10,11 +10,20 @@ SECTION = "Applications/System" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" -SRC_URI = "git://git.debian.org/git/logcheck/logcheck.git" -SRCREV = "2429e67ad875fee8a0234c64d504277b038c89cd" +SRC_URI = "git://git.debian.org/git/logcheck/logcheck.git \ + file://99_logcheck \ +" +SRCREV = "0a5865d80fa34c55387a1917a3e6f885bcff7f1d" S = "${WORKDIR}/git" +inherit useradd + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-m -g ${BPN} -G adm -r -d ${localstatedir}/lib/${BPN} \ + -s /bin/false -c 'logcheck account' ${BPN}" +GROUPADD_PARAM_${PN} = "-r ${BPN}" + do_install() { # Fix QA Issuesed -i '/install -d $(DESTDIR)\/var\/lock\/logcheck/s/^/#/' Makefilemeta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +1
-2@@ -25,14 +34,47 @@ do_install() { install -m 644 docs/logcheck-test.1 ${D}${mandir}/man1/ install -m 644 docs/logtail.8 ${D}${mandir}/man8/ install -m 644 docs/logtail2.8 ${D}${mandir}/man8/ - sed -i "s/syslog/messages/" etc/logcheck.logfiles - sed -i "s/auth\.log/secure/" etc/logcheck.logfiles + install -m 755 -d ${D}${sysconfdir}/cron.d install -m 644 debian/logcheck.cron.d ${D}${sysconfdir}/cron.d/logcheck
install -m 755 -d ${D}/var/lib/logcheckmeta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +9
-0+ oe_runmake install DESTDIR=${D} + + # install header.txt for generated mails + install -m 0644 ${S}/debian/header.txt ${D}${sysconfdir}/${BPN} + + chown -R ${BPN}:${BPN} ${D}${localstatedir}/lib/${BPN} + chown -R root:${BPN} ${D}${sysconfdir}/${BPN} + + # Don't install /var/lock when populating rootfs. Do it throughvolatile
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true',
'false', d)}; thenmeta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +2
-0+ install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_logcheck ${D}${sysconfdir}/default/volatiles
meta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +2
-0+ fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true','false', d)}; then
meta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb +21
-2+ install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/lock/logcheck 0755 logcheck logcheck -" \ + > ${D}${sysconfdir}/tmpfiles.d/logcheck.conf + fi } -RDEPENDS_${PN} = "perl" +VIRTUAL-RUNTIME_syslog ??= "rsyslog" + +RDEPENDS_${PN} = "\ + bash \ + cronie \ + debianutils-run-parts \ + grep \ + lockfile-progs \ + perl \ + perl-module-file-basename \ + perl-module-getopt-std \ + perl-module-file-glob \ + ${VIRTUAL-RUNTIME_syslog} \ +" + +# mime-construct is for mailing the reports, not mandatory +RRECOMMENDS_${PN} = "mime-construct" FILES_${PN} += "${datadir}/logtail" --2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
It fails without meta-perl, so I think I have to move it to meta-perl.
Thanks,
Jackie
From: Martin Jansa [mailto:[email protected]]
Sent: Tuesday, August 22, 2017 16:50
To: Huang, Jie (Jackie)
Cc: openembedded-devel
Subject: Re: [oe] [meta-oe][PATCH v2] logcheck: update to 1.3.18
Unfortunately it still fails even with RRECOMMENDS, try it without meta-perl.
On Wed, Aug 16, 2017 at 4:23 AM, <[email protected]<mailto:[email protected]>> wrote:
From: Jackie Huang <[email protected]<mailto:[email protected]>>
Changes:
- logcheck should not be run as root, so inherit useradd and add proper user and group.
- Add missing runtime dependencies according to the file debian/control and simple test by running "logcheck -ot".
- For syslog, debian directly depends on rsyslog, but logcheck works with any syslog and we have busybox-syslog, sysklogd, syslog-ng and rsyslog, so use VIRTUAL-RUNTIME_syslog for the syslog dependency and set rsyslog as the default, which can be easily overridden in distro conf file or local.conf.
- Don't install /var/lock when populating rootfs. Do it through volatile.
- install header.txt for generated mails
---
.../recipes-extended/logcheck/files/99_logcheck | 2 +
.../{logcheck_1.3.17.bb<http://logcheck_1.3.17.bb> => logcheck_1.3.18.bb<http://logcheck_1.3.18.bb>} | 52 +++++++++++++++++++---
2 files changed, 49 insertions(+), 5 deletions(-)
create mode 100644 meta-oe/recipes-extended/logcheck/files/99_logcheck
rename meta-oe/recipes-extended/logcheck/{logcheck_1.3.17.bb<http://logcheck_1.3.17.bb> => logcheck_1.3.18.bb<http://logcheck_1.3.18.bb>} (45%)meta-oe/recipes-extended/logcheck/files/99_logcheck new file +2 -0
@@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d logcheck logcheck 0755 /var/lock/logcheck none
meta-oe/recipes-extended/logcheck/logcheck_1.3.18.bb<http://logcheck_1.3.18.bb> renamed from meta-oe/recipes-extended/logcheck/logcheck_1.3.17.bb<http://logcheck_1.3.17.bb> +47 -5
72 lines not on this page · raw message
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list [email protected]<mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel