Commit Graph

37 Commits

Author SHA1 Message Date
Ross Burton
21f10c11f3 meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-28 10:38:38 +02:00
Tudor Florea
d74d33e1e4 rsyslog: add tls related tests
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:54 +01:00
Tudor Florea
f3e06eeb77 rsyslog: avoid deprecated GnuTLS functions
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:54 +01:00
Martin Jansa
03491cecc5 rsyslog: blacklist because of gnutls upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-06 13:26:01 +01:00
Wenzong Fan
e29f64293c rsyslog: fix ptest
After rsyslog updated to 7.6.1, ptest fails to build & run since the
serial-tests config patch was dropped:

 - rsyslog-use-serial-tests-config-needed-by-ptest.patch

This patch involved serial test harness:

 + AM_INIT_AUTOMAKE([serial-tests])

Which is deprecated in favour of parallel test harness. Automake
generated a parallel test harness by default. It features automatic
collection of the test scripts output in .log files ...

More details please refer to:

 http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html

To enable the ptest with new changes, we should:

* add target 'buildtest-TESTS' for building test components;
* fix 'top_srcdir' and install required script 'test-driver';
* run testcases with target 'check-TESTS'.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-23 15:39:45 +02:00
Roy Li
db83394a6b rsyslog: upgrade to 7.6.1
1. remove two backport patch: 0001-bugfix-potential-abort-during-HUP.patch
and 0001-remove-memleak-introduced-by-GenerateLocalHostName-H.patch
2. update the patch json-0.12-fix.patch
3. remove a obsolete patch rsyslog-use-serial-tests-config-needed-by-ptest.patch
4. update the Dependence
5. update the checksum

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-08-24 13:58:18 +02:00
Yue Tao
b9a8410d15 rsyslog: remove the dependency on valgrind for mips64n32
valgrind is not supported mips64n32, so remove it

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-07-16 21:09:10 +02:00
Li Zhou
e7e67108df rsyslogd: Backport upstream commits to fix rsyslog segmentation fault when heavy load
Backport <commit 9a775051f7373176c6e54bee1110965342dd41ad> and
<commit 17e1ee2539cea6bac16832b488afd52b20a348ac> from rsyslog
upstream <https://github.com/rsyslog/rsyslog> to solve issue:
rsyslog segmentation fault when heavy load.
Solve the race condition in GenerateLocalHostNameProperty between the
prop.Destruct(&propLocalHostName) and prop.Construct(&propLocalHostName).

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-05-11 10:25:53 +02:00
Steffen Sledz
4151e38933 rsyslog: fix name of syslogd ua group
All the other syslogd implementations use 'syslogd' as update alternatives
group name. So rsyslogd should use this too.

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-27 09:35:51 +01:00
Jackie Huang
511baab441 rsyslog: don't call init script in logrotate conf file
Send HUP signal instead of calling the reload command
of init script in logrotate configure file, so that it
also works when the init system is systemd.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-12 19:33:25 +01:00
Jackie Huang
5db5c07c0d rsyslog: add packageconfig for imfile module
* imfile: Text file input module, added as default

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-02-12 19:33:25 +01:00
Jackie Huang
9b2fde4247 rsyslog: set the default file permission
We use the default file permission root:adm for syslog-ng,
so set the same for rsyslog.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-01-28 09:52:51 +01:00
Martin Jansa
bd2d39df79 rsyslog: fix build with json-0.12
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-01-15 16:36:35 +01:00
Jackie Huang
a6e7689167 rsyslog: add ptest support
Changed:
- add a patch to use serial-tests config needed by ptest
- add a patch to fix rsyslog test cases don't finish issue
- add run-ptest, do_compile_ptest and do_install_ptest
- add dependency for rsyslog-ptest
- add PACKAGECONFIG for valgrind

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-09-26 05:42:53 +02:00
Chen Qi
2b32463cfc rsyslog: add UPDATE_ALTERNATIVE for syslog-service
Use ALTERNATIVE mechanism in OE to manage the syslog service to
avoid conflicts with other syslog implementations like sysklogd
or busybox.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-09-26 05:41:54 +02:00
Jackie Huang
c0945057ff rsyslog: use syslog as the script name of syslog-init
Use syslog as the default symlink and INITSCRIPT_NAME
just as sysklogd and syslog-ng did.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-08-11 11:00:42 +02:00
Roy Li
5e0545d79e rsyslog: use pkgconfig to check libgcrypt
libgcrypt does no longer provide libgcrypt-config, and provide
*.pc, so we should use pkgconfig to check

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-06-21 10:36:54 +02:00
Jackie Huang
d1a619eedd rsyslog: add DEPENDS on bison-native and flex-native
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2014-05-03 20:45:01 +02:00
Jackie Huang
e23158541c rsyslog: Add config files and use update-alternatives for rsyslog
- Add a logrotate config file for rsyslog.
- Change rsyslog.conf to be compatible with sysklogd.conf.
- Use update-alternatives since we have other syslog systems:
  sysklogd, busybox-syslog, etc.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2014-05-03 20:45:01 +02:00
Jackie Huang
9ef1b54236 rsyslog: add PACKAGECONFIG for optional features
rsyslog supports many optional features, add PACKAGECONFIG
for them to ensures that the dependency on related packages
is deterministic and so that we can easily enable/disable
features.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2014-05-03 20:45:01 +02:00
Jackie Huang
1760dd3e89 rsyslog: use BPN to fix multilib and add all licenses
- use BPN instead of PN to fix multilib builds
- add all three licenses
- add DESCRIPTION

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2014-05-03 20:45:00 +02:00
Jackie Huang
31c10e6dd3 rsyslog: add status command and a minor fix for initscript
- add status command
- add --oknodo for do_start

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-04-20 16:10:20 +02:00
Jack Mitchell
f311d52be6 rsyslog: remove unsupported option from initscript
> starting rsyslogd ... rsyslogd: error: option -c
> is no longer supported - ignored

Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-04-20 16:09:53 +02:00
Matthieu CRAPET
c95e155780 recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line

Note: don't bump PR

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-23 23:20:02 +01:00
Kang Kai
3b50ee2fa6 lib32-rsyslog: fix wrong systemd server file
When enable multilib on x86-64, it fails to build lib32-rsyslog with
error:

| ERROR: Function failed: SYSTEMD_SERVICE_lib32-rsyslog value lib32-rsyslog.service does not exist

It uses wrong value ${PN}.service to set SYSTEMD_SERVICE. Correct it by
using BPN.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-12-21 19:16:50 +01:00
Olof Johansson
20525d901c rsyslog: rename libjson to json-c in DEPENDS
The libjson recipe was renamed to json-c in commit 533c1db2 of oe-core.

Signed-off-by: Olof Johansson <olof.johansson@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-11-24 15:18:37 +01:00
Olof Johansson
ed796941d0 rsyslog: fix dependency name (json-c => libjson)
Signed-off-by: Olof Johansson <olof.johansson@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-21 12:15:03 +02:00
Jack Mitchell
b239cd1553 rsyslog: update to 7.4.4
Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-17 21:36:58 +02:00
Martin Jansa
d048fd049f rsyslog: inherit pkgconfig
* without pkgconfig it's failing to expand PKG_CHECK_MODULES macro:
  | rsyslog-5.8.0/configure: line 16111: syntax error near unexpected token `GNUTLS,'
  | rsyslog-5.8.0/configure: line 16111: `    PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0)'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-12 12:06:02 +02:00
Martin Jansa
a45830a39b recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
  tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
  tabs is the need to update a lot of recipes). Lately this advice
  was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
  error prone when someone is not sure if e.g.
  do_generate_toolchain_file() is Python or shell task and also allows
  to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
  potentially bad (shouldn't be used for indenting of multiline
  variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
  we're quite inconsistent wheater it's first character on line
  under opening quote or under first non-whitespace character in
  previous line.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
2013-04-15 16:23:17 +02:00
Martin Jansa
2db07ef244 rsyslog: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-15 16:22:05 +02:00
Andreas Müller
fca1dffca7 rsyslog: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2012-07-16 09:39:07 +02:00
Martin Jansa
21b85f3426 recipes: bump PR to fix -systemd postinsts where SYSTEMD_SERVICE was used without PN* suffix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-06-05 10:46:52 +02:00
Andreas Müller
af6d280e23 rsyslog: remove unneeded systemd code
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-02-23 16:46:32 +01:00
Otavio Salvador
cb372a589a rsyslog: move systemd support to rsyslog-systemd
This makes the package consistent with others supporting systemd and
also cleans up the recipe using the systemd.bbclass.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2011-12-23 08:53:02 +01:00
Anders Darander
dd54be4a2f rsyslog: change postrm to prerm
The systemd service can't be disabled if it already has been removed, thus disable it
prior to removing the package.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-11-09 14:16:14 +01:00
Koen Kooi
c85efd2281 rsyslog: add 5.8.0
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2011-06-17 19:45:58 +02:00