From: Richard Tollerton <[email protected]> Package build fixes: - Skip dev-so insane checks, since syslog-ng installs /usr/lib/syslog-ng/libafsocket.so - Remove ${SOLIBSDEV} from syslog-ng-dev - Add "${libdir}/${BPN}/*" to base package
Other changes: - Start initscript at level 19 (was 20); allows it to start before busybox-cron - Force /usr/include/scl to be owned by root - Fix license versions (GPL -> GPLv2 and LGPL -> LGPLv2.1) Signed-off-by: Richard Tollerton <[email protected]> Signed-off-by: Ben Shelton <[email protected]> --- meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 8 ++++---- meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index e0c9055..eb7b9cc 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -1,13 +1,13 @@ DESCRIPTION = "Alternative system logger daemon" DEPENDS = "libol flex eventlog glib-2.0" -LICENSE = "GPL LGPL" +LICENSE = "GPLv2 LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5" # syslog initscript is handled explicitly because order of # update-rc.d and update-alternatives is important RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" -INC_PR = "r12" +INC_PR = "r13" inherit autotools systemd @@ -51,7 +51,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} ${base_libdir}/*${SOLIBS} \ ${datadir}/${BPN} ${libdir}/${BPN}/*${SOLIBS} \ ${datadir}/include/scl/ ${datadir}/xsd" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}" +FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la" CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf" RPROVIDES_${PN} += "${PN}-systemd" @@ -71,7 +71,7 @@ pkg_postinst_${PN} () { # remove all rc.d-links potentially created from alternative # syslog packages before creating new ones update-rc.d $OPT -f syslog remove - update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 . + update-rc.d $OPT syslog start 19 2 3 4 5 . stop 90 0 1 6 . } pkg_prerm_${PN} () { diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb index 6d1fee7..9f89740 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bb @@ -6,5 +6,12 @@ SRC_URI += " \ file://initscript \ " +FILES_${PN} += "${libdir}/${BPN}/*" +INSANE_SKIP_${PN} = "dev-so" + +do_install_append() { + chown -R root:root ${D}/${datadir}/include/scl/ +} + SRC_URI[md5sum] = "60737452ce898f9dc7170dfdc9bfd732" SRC_URI[sha256sum] = "ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89" -- 2.0.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
