[oe] [meta-oe][PATCH 2/2] rsyslog: add PACKAGECONFIG for imjournal

[ChenQi]

On 08/04/2018 12:27 AM, Khem Raj wrote:
> On Fri, Aug 3, 2018 at 3:03 AM <Qi.Chen at windriver.com> wrote:
>> From: Chen Qi <Qi.Chen at windriver.com>
>>
>> Add PACKAGECONFIG for imjournal, and add corresponding configuration
>> to /etc/rsyslog.conf when it's enabled. Default to disable it.
>>
>> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
>> ---
>>   meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
>> index d90695a..1bcbde1 100644
>> --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
>> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb
>> @@ -67,6 +67,7 @@ PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,,"
>>   PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp,"
>>   PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls,"
>>   PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd,"
>> +PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal,"
>>   PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,"
>>   PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql,"
>>   PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi,"
>> @@ -126,6 +127,10 @@ do_install_append() {
>>       install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
>>       install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
>>       sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
>> +
>> +    if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then
>> +        echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.conf
>> +    fi
> perhaps its time to add something like
>
> $IncludeConfig /etc/rsyslog.d/*.conf
>
> in main etc/rsyslog.conf and then such fragments can be places as
> individual config
> files inside that directory

I agree. I'll send out V2.

Best Regards,
Chen Qi

>>   }
>>
>>   FILES_${PN} += "${bindir}"
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel