Message ID | 02a60c5e69f7dcc3184723c8981da484c950ea55.1389173315.git.kibo@prevas.dk |
---|---|
State | Accepted |
Delegated to: | Esben Haabendal |
Headers | show |
Kim Bøndergaard <kibo@prevas.dk> writes: > --- > recipes/rsyslog/rsyslog.inc | 14 ++++++++++---- > recipes/rsyslog/rsyslog_8.1.3.oe | 1 + > recipes/rsyslog/rsyslog_8.1.3.oe.sig | 1 + > 3 files changed, 12 insertions(+), 4 deletions(-) > create mode 100644 recipes/rsyslog/rsyslog_8.1.3.oe > create mode 100644 recipes/rsyslog/rsyslog_8.1.3.oe.sig > > diff --git a/recipes/rsyslog/rsyslog.inc b/recipes/rsyslog/rsyslog.inc > index 5774817..c2ffdcd 100644 > --- a/recipes/rsyslog/rsyslog.inc > +++ b/recipes/rsyslog/rsyslog.inc > @@ -2,16 +2,22 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" > HOMEPAGE = "http://www.rsyslog.com/" > LICENSE = "GPL-3.0" > > -DEPENDS_LIBC = "libdl libpthread librt" > +DEPENDS_LIBC = "libdl libpthread librt libgcrypt" Should libgcrypt be added to DEPENDS of old rsyslog versions? If not, you should make this change in rsyslog_8.1.3.oe instead. That said, the idea with this DEPENDS_LIBC variable is to contain the C library specific libraries, which can then be changed for platforms with non-glibc C library (like mingw). So libgcrypt does not belong in DEPENDS_LIBC, and would actually cause mingw build to break, as I assume libgcrypt will be needed on mingw also. > DEPENDS_LIBC:HOST_LIBC_mingw = "" > -DEPENDS = "libz ${DEPENDS_LIBC}" > -RDEPENDS_${PN} += "libz ${DEPENDS_LIBC}" > +DEPENDS = "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" Is this libestr the one you have in https://gitorious.org/oe-lite/kibos-base/source/b2fce5f2d5cd78b61787d422b886fa1f462faf4a:recipes/libestr/libestr_0.1.9.oe ? If the libestr should be merged, please send it to the mailing list. > +DEPENDS_${PN} += "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" > +RDEPENDS_${PN} += "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" > > SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ > file://rsyslog.conf \ > file://rsyslog" > > -inherit autotools-autoreconf sysvinit > +inherit autotools-autoreconf sysvinit pkgconfig Should pkgconfig class be used also for old rsyslog versions? > + > +EXTRA_OECONF += " \ > + --enable-cached-man-pages \ > +" Really? Why enable cached man pages? > + > RECIPE_FLAGS = "rsyslog_sysvinit_start rsyslog_logdir rsyslog_logfile" > DEFAULT_USE_rsyslog_sysvinit_start = "20" > DEFAULT_USE_rsyslog_logdir = "${localstatedir}/log" > diff --git a/recipes/rsyslog/rsyslog_8.1.3.oe b/recipes/rsyslog/rsyslog_8.1.3.oe > new file mode 100644 > index 0000000..c0a6752 > --- /dev/null > +++ b/recipes/rsyslog/rsyslog_8.1.3.oe > @@ -0,0 +1 @@ > +require rsyslog.inc > diff --git a/recipes/rsyslog/rsyslog_8.1.3.oe.sig b/recipes/rsyslog/rsyslog_8.1.3.oe.sig > new file mode 100644 > index 0000000..d0ebe4f > --- /dev/null > +++ b/recipes/rsyslog/rsyslog_8.1.3.oe.sig > @@ -0,0 +1 @@ > +62e066becd58b215afd2bafa83788e1763cc238e rsyslog-8.1.3.tar.gz
I made the needed changes and merged to master. I also picked libestr recipe from your gitorious repo. /Esben
diff --git a/recipes/rsyslog/rsyslog.inc b/recipes/rsyslog/rsyslog.inc index 5774817..c2ffdcd 100644 --- a/recipes/rsyslog/rsyslog.inc +++ b/recipes/rsyslog/rsyslog.inc @@ -2,16 +2,22 @@ DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPL-3.0" -DEPENDS_LIBC = "libdl libpthread librt" +DEPENDS_LIBC = "libdl libpthread librt libgcrypt" DEPENDS_LIBC:HOST_LIBC_mingw = "" -DEPENDS = "libz ${DEPENDS_LIBC}" -RDEPENDS_${PN} += "libz ${DEPENDS_LIBC}" +DEPENDS = "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" +DEPENDS_${PN} += "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" +RDEPENDS_${PN} += "libz libestr libjson-c libuuid ${DEPENDS_LIBC}" SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ file://rsyslog.conf \ file://rsyslog" -inherit autotools-autoreconf sysvinit +inherit autotools-autoreconf sysvinit pkgconfig + +EXTRA_OECONF += " \ + --enable-cached-man-pages \ +" + RECIPE_FLAGS = "rsyslog_sysvinit_start rsyslog_logdir rsyslog_logfile" DEFAULT_USE_rsyslog_sysvinit_start = "20" DEFAULT_USE_rsyslog_logdir = "${localstatedir}/log" diff --git a/recipes/rsyslog/rsyslog_8.1.3.oe b/recipes/rsyslog/rsyslog_8.1.3.oe new file mode 100644 index 0000000..c0a6752 --- /dev/null +++ b/recipes/rsyslog/rsyslog_8.1.3.oe @@ -0,0 +1 @@ +require rsyslog.inc diff --git a/recipes/rsyslog/rsyslog_8.1.3.oe.sig b/recipes/rsyslog/rsyslog_8.1.3.oe.sig new file mode 100644 index 0000000..d0ebe4f --- /dev/null +++ b/recipes/rsyslog/rsyslog_8.1.3.oe.sig @@ -0,0 +1 @@ +62e066becd58b215afd2bafa83788e1763cc238e rsyslog-8.1.3.tar.gz