diff options
| author |   Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-01-12 18:23:16 -0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-27 12:43:56 +0100 |
| commit | 72210ea4769d9f58477931d78c4e506ef6ad776b (patch) | |
| tree | 7f57280e0fdd2bb5303018c02362089ae9ec42a5 /meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |
| parent | 19a3f18e1e4f40a2c52108765c1f91e89691ba0e (diff) | |
| download | meta-openembedded-contrib-72210ea4769d9f58477931d78c4e506ef6ad776b.tar.gz | |
syslog-ng: 3.5.4.1 -> 3.6.4
Upgrade syslog-ng from 3.5.4.1 to 3.6.4.
1) Modify the syslog-ng.service-the-syslog-ng-service.patch,since the datas has been changed.
2) Delete these patches,since they are not needed any more.
afsql-afsql_dd_insert_db-refactor.patch
deinit-the-new-config-when-reverting-to-the.patch
free-global-LogTemplateOptions.patch
still-free-the-unconsumed-item.patch
syslog-ng-verify-the-list-before-del.patch
rewrite-expr-grammar.ym-Free-up-token.patch
logwriter-dont-allocate-a-new-buffer.patch
3) Fix WARNING:
QA Issue: syslog-ng-libs rdepends on libpcre, but it isn't a build dependency? [build-deps]
QA Issue: syslog-ng rdepends on libpcre, but it isn't a build dependency? [build-deps]
4) Fix ERROR: QA Issue: non -staticdev package contains static .a library:
work/i586-poky-linux/syslog-ng/3.6.4-r0/packages-split/syslog-ng/usr/lib/syslog-ng/libtest/libsyslog-ng-test.a' [staticdev]
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/syslog-ng.inc')
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 54f6920f5b..ed41f01994 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -13,7 +13,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=e0e8658d9be248f01b7933df24dc1408" # util-linux added to get libuuid -DEPENDS = "flex eventlog glib-2.0 util-linux" +DEPENDS = "libpcre flex eventlog glib-2.0 util-linux" SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${BPN}_${PV}.tar.gz \ file://syslog-ng.conf \ @@ -70,6 +70,9 @@ do_install_append() { install -d ${D}/${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run + sed -i -e 's,@SBINDIR@,${sbindir},g' ${S}/contrib/systemd/*.service + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${S}/contrib/systemd/*.service + sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${S}/contrib/systemd/*.service } FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools" @@ -80,6 +83,7 @@ PACKAGES =+ "${PN}-libs ${PN}-libs-dev ${PN}-libs-dbg" FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" FILES_${PN}-libs-dbg = "${libdir}/${BPN}/.debug" +FILES_${PN}-staticdev = "${libdir}/${BPN}/libtest/*.a" INSANE_SKIP_${PN}-libs = "dev-so" RDEPENDS_${PN} += "${PN}-libs" |