* [meta-oe][PATCHv3 0/3] rsyslog: update to 7.4.4
@ 2013-10-14 14:20 Jack Mitchell
2013-10-14 14:20 ` [meta-oe][PATCHv3 1/3] json-c: add 0.11 Jack Mitchell
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jack Mitchell @ 2013-10-14 14:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jack Mitchell
From: Jack Mitchell <jmitchell@cbnl.com>
update rsyslog to the latest version and add required dependancies.
v3:
- change /usr/bin to ${bindir} QA warning fires if this is not present
- change json-c to not be built in parallel as it can sometimes fail
v2:
- add signed-off-by
Jack Mitchell (3):
json-c: add 0.11
libestr: add 0.1.6
rsyslog: update to 7.4.4
.../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 60 ----------------------
meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb | 5 --
.../rsyslog/{rsyslog.inc => rsyslog_7.4.4.bb} | 24 ++++++---
meta-oe/recipes-support/json-c/json-c_0.11.bb | 13 +++++
meta-oe/recipes-support/libestr/libestr_0.1.6.bb | 11 ++++
5 files changed, 40 insertions(+), 73 deletions(-)
delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb
rename meta-oe/recipes-extended/rsyslog/{rsyslog.inc => rsyslog_7.4.4.bb} (54%)
create mode 100644 meta-oe/recipes-support/json-c/json-c_0.11.bb
create mode 100644 meta-oe/recipes-support/libestr/libestr_0.1.6.bb
--
1.8.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [meta-oe][PATCHv3 1/3] json-c: add 0.11 2013-10-14 14:20 [meta-oe][PATCHv3 0/3] rsyslog: update to 7.4.4 Jack Mitchell @ 2013-10-14 14:20 ` Jack Mitchell 2013-10-17 15:34 ` Martin Jansa 2013-10-14 14:20 ` [meta-oe][PATCHv3 2/3] libestr: add 0.1.6 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 3/3] rsyslog: update to 7.4.4 Jack Mitchell 2 siblings, 1 reply; 6+ messages in thread From: Jack Mitchell @ 2013-10-14 14:20 UTC (permalink / raw) To: openembedded-devel; +Cc: Jack Mitchell From: Jack Mitchell <jmitchell@cbnl.com> Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> --- meta-oe/recipes-support/json-c/json-c_0.11.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta-oe/recipes-support/json-c/json-c_0.11.bb diff --git a/meta-oe/recipes-support/json-c/json-c_0.11.bb b/meta-oe/recipes-support/json-c/json-c_0.11.bb new file mode 100644 index 0000000..e0391f5 --- /dev/null +++ b/meta-oe/recipes-support/json-c/json-c_0.11.bb @@ -0,0 +1,13 @@ +SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C" +HOMEPAGE = "https://github.com/json-c/json-c/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" + +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" + +SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98" +SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c" + +PARALLEL_MAKE = "" + +inherit autotools -- 1.8.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCHv3 1/3] json-c: add 0.11 2013-10-14 14:20 ` [meta-oe][PATCHv3 1/3] json-c: add 0.11 Jack Mitchell @ 2013-10-17 15:34 ` Martin Jansa 2013-10-18 8:46 ` Jack Mitchell 0 siblings, 1 reply; 6+ messages in thread From: Martin Jansa @ 2013-10-17 15:34 UTC (permalink / raw) To: openembedded-devel; +Cc: Jack Mitchell [-- Attachment #1: Type: text/plain, Size: 1550 bytes --] On Mon, Oct 14, 2013 at 03:20:11PM +0100, Jack Mitchell wrote: > From: Jack Mitchell <jmitchell@cbnl.com> > > Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> > --- > meta-oe/recipes-support/json-c/json-c_0.11.bb | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > create mode 100644 meta-oe/recipes-support/json-c/json-c_0.11.bb > > diff --git a/meta-oe/recipes-support/json-c/json-c_0.11.bb b/meta-oe/recipes-support/json-c/json-c_0.11.bb > new file mode 100644 > index 0000000..e0391f5 > --- /dev/null > +++ b/meta-oe/recipes-support/json-c/json-c_0.11.bb > @@ -0,0 +1,13 @@ > +SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C" > +HOMEPAGE = "https://github.com/json-c/json-c/wiki" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" > + > +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" > + > +SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98" > +SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c" > + > +PARALLEL_MAKE = "" > + > +inherit autotools It conflicts with libjson from oe-core: WARNING: libjson-0.9 is already registered as shlib provider for libjson.so.0, ignoring json-c-0.11 trying to register the same openembedded-core/meta/recipes-devtools/libjson/libjson_0.9.bb You probably want to upgrade libjson in oe-core if it's the same json-c... -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCHv3 1/3] json-c: add 0.11 2013-10-17 15:34 ` Martin Jansa @ 2013-10-18 8:46 ` Jack Mitchell 0 siblings, 0 replies; 6+ messages in thread From: Jack Mitchell @ 2013-10-18 8:46 UTC (permalink / raw) To: openembedded-devel On 17/10/13 16:34, Martin Jansa wrote: > On Mon, Oct 14, 2013 at 03:20:11PM +0100, Jack Mitchell wrote: >> From: Jack Mitchell <jmitchell@cbnl.com> >> >> Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> >> --- >> meta-oe/recipes-support/json-c/json-c_0.11.bb | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> create mode 100644 meta-oe/recipes-support/json-c/json-c_0.11.bb >> >> diff --git a/meta-oe/recipes-support/json-c/json-c_0.11.bb b/meta-oe/recipes-support/json-c/json-c_0.11.bb >> new file mode 100644 >> index 0000000..e0391f5 >> --- /dev/null >> +++ b/meta-oe/recipes-support/json-c/json-c_0.11.bb >> @@ -0,0 +1,13 @@ >> +SUMMARY = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C" >> +HOMEPAGE = "https://github.com/json-c/json-c/wiki" >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" >> + >> +SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" >> + >> +SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98" >> +SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c" >> + >> +PARALLEL_MAKE = "" >> + >> +inherit autotools > > It conflicts with libjson from oe-core: > WARNING: libjson-0.9 is already registered as shlib > provider for libjson.so.0, ignoring json-c-0.11 trying to register the > same > > openembedded-core/meta/recipes-devtools/libjson/libjson_0.9.bb > > You probably want to upgrade libjson in oe-core if it's the same json-c... > > Ah, that's not confusing at all eh! I've sent a patch to oe-core, if they take it i'll ping you about pulling the libestr and rsyslogd. Thanks JaMa! -- Jack Mitchell (jack@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- ^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCHv3 2/3] libestr: add 0.1.6 2013-10-14 14:20 [meta-oe][PATCHv3 0/3] rsyslog: update to 7.4.4 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 1/3] json-c: add 0.11 Jack Mitchell @ 2013-10-14 14:20 ` Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 3/3] rsyslog: update to 7.4.4 Jack Mitchell 2 siblings, 0 replies; 6+ messages in thread From: Jack Mitchell @ 2013-10-14 14:20 UTC (permalink / raw) To: openembedded-devel; +Cc: Jack Mitchell From: Jack Mitchell <jmitchell@cbnl.com> Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> --- meta-oe/recipes-support/libestr/libestr_0.1.6.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 meta-oe/recipes-support/libestr/libestr_0.1.6.bb diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.6.bb b/meta-oe/recipes-support/libestr/libestr_0.1.6.bb new file mode 100644 index 0000000..ae29856 --- /dev/null +++ b/meta-oe/recipes-support/libestr/libestr_0.1.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "some essentials for string handling (and a bit more)" +HOMEPAGE = "http://libestr.adiscon.com/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0" + +SRC_URI = "http://libestr.adiscon.com/files/download/${P}.tar.gz" + +SRC_URI[md5sum] = "f48a7098080eebfe7842673c23dcd064" +SRC_URI[sha256sum] = "b9c819d30397845fdf85bb1f37c52e81de23aa3b061ec6cc4386f1b942960153" + +inherit autotools -- 1.8.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCHv3 3/3] rsyslog: update to 7.4.4 2013-10-14 14:20 [meta-oe][PATCHv3 0/3] rsyslog: update to 7.4.4 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 1/3] json-c: add 0.11 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 2/3] libestr: add 0.1.6 Jack Mitchell @ 2013-10-14 14:20 ` Jack Mitchell 2 siblings, 0 replies; 6+ messages in thread From: Jack Mitchell @ 2013-10-14 14:20 UTC (permalink / raw) To: openembedded-devel; +Cc: Jack Mitchell From: Jack Mitchell <jmitchell@cbnl.com> Signed-off-by: Jack Mitchell <jmitchell@cbnl.com> --- .../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 60 ---------------------- meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb | 5 -- .../rsyslog/{rsyslog.inc => rsyslog_7.4.4.bb} | 24 ++++++--- 3 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf delete mode 100644 meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb rename meta-oe/recipes-extended/rsyslog/{rsyslog.inc => rsyslog_7.4.4.bb} (54%) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf deleted file mode 100644 index 47fc440..0000000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ /dev/null @@ -1,60 +0,0 @@ -# if you experience problems, check -# http://www.rsyslog.com/troubleshoot for assistance - -# rsyslog v3: load input modules -# If you do not load inputs, nothing happens! -# You may need to set the module load path if modules are not found. - -$ModLoad immark # provides --MARK-- message capability -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) -$ModLoad imklog # kernel logging (formerly provided by rklogd) - -# Log all kernel messages to the console. -# Logging much else clutters up the screen. -#kern.* /dev/console - -# Log anything (except mail) of level info or higher. -# Don't log private authentication messages! -*.info;mail.none;authpriv.none;cron.none -/var/log/messages - -# The authpriv file has restricted access. -authpriv.* /var/log/secure - -# Log all the mail messages in one place. -mail.* -/var/log/maillog - - -# Log cron stuff -cron.* -/var/log/cron - -# Everybody gets emergency messages -*.emerg * - -# Save news errors of level crit and higher in a special file. -uucp,news.crit -/var/log/spooler - -# Save boot messages also to boot.log -local7.* /var/log/boot.log - -# Remote Logging (we use TCP for reliable delivery) -# An on-disk queue is created for this action. If the remote host is -# down, messages are spooled to disk and sent when it is up again. -#$WorkDirectory /rsyslog/spool # where to place spool files -#$ActionQueueFileName uniqName # unique name prefix for spool files -#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) -#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown -#$ActionQueueType LinkedList # run asynchronously -#$ActionResumeRetryCount -1 # infinite retries if host is down -# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional -#*.* @@remote-host:514 - - -# ######### Receiving Messages from Remote Hosts ########## -# TCP Syslog Server: -# provides TCP syslog reception and GSS-API (if compiled to support it) -#$ModLoad imtcp.so # load module -#$InputTCPServerRun 514 # start up TCP listener at port 514 - -# UDP Syslog Server: -#$ModLoad imudp.so # provides UDP syslog reception -#$UDPServerRun 514 # start a UDP syslog server at standard port 514 diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb deleted file mode 100644 index 3a6540d..0000000 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require rsyslog.inc -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "37562d0e71a24938a9ed7f242bd32d35" -SRC_URI[sha256sum] = "e034b02473fd7e5313522173ec2f6c57e6fbcaec2c6b289edb968b1d64ae3ffd" diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb similarity index 54% rename from meta-oe/recipes-extended/rsyslog/rsyslog.inc rename to meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb index 4b2935f..0101004 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb @@ -1,24 +1,32 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" -DEPENDS = "zlib" +DEPENDS = "zlib libestr json-c" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973" -INC_PR = "r8" - SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ - file://rsyslog.conf" + file://initscript \ +" + +SRC_URI[md5sum] = "ebcc010a6205c28eb505c0fe862f32c6" +SRC_URI[sha256sum] = "276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig systemd update-rc.d -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)} --enable-cached-man-pages" do_install_append() { - install -d ${D}/${sysconfdir}/${PN} - install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf + install -d "${D}${sysconfdir}/init.d" + install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/rsyslogd + install -m 755 ${S}/platform/redhat/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf } +FILES_${PN} += "${bindir}" + +INITSCRIPT_NAME = "rsyslogd" +INITSCRIPT_PARAMS = "defaults" + CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" RPROVIDES_${PN} += "${PN}-systemd" -- 1.8.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-18 8:46 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-10-14 14:20 [meta-oe][PATCHv3 0/3] rsyslog: update to 7.4.4 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 1/3] json-c: add 0.11 Jack Mitchell 2013-10-17 15:34 ` Martin Jansa 2013-10-18 8:46 ` Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 2/3] libestr: add 0.1.6 Jack Mitchell 2013-10-14 14:20 ` [meta-oe][PATCHv3 3/3] rsyslog: update to 7.4.4 Jack Mitchell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.