Re: [oe] [meta-oe][PATCH] tftpd-hpa: fix premature exit
Merged, thanks. -J. [[oe] [meta-oe][PATCH] tftpd-hpa: fix premature exit] On 13.10.12 (Sat 10:04) David Turgeon wrote: > standalone daemon exits as recipe installs file as tftpd-hpa > > * Changed script so it can consult /etc/default, as daemon name may be > subject to change. > * Changed the default name to match the recipe > > Signed-off-by: David Turgeon > --- > .../recipes-daemons/tftp-hpa/files/init| 13 +++-- > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init > b/meta-networking/recipes-daemons/tftp-hpa/files/init > index 5ad8c52..9e18436 100644 > --- a/meta-networking/recipes-daemons/tftp-hpa/files/init > +++ b/meta-networking/recipes-daemons/tftp-hpa/files/init > @@ -18,20 +18,21 @@ set -e > > PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin > DESC="HPA's tftpd" > -NAME=in.tftpd > -DAEMON=/usr/sbin/$NAME > -PIDFILE=/var/run/$NAME.pid > +NAME=in.tftpd-hpa > SCRIPTNAME=/etc/init.d/tftpd-hpa > > -# Gracefully exit if the package has been removed. > -test -x $DAEMON || exit 0 > - > # Read config file if it is present. > if [ -r /etc/default/tftpd-hpa ] > then > . /etc/default/tftpd-hpa > fi > > +DAEMON=/usr/sbin/$NAME > +PIDFILE=/var/run/$NAME.pid > + > +# Gracefully exit if the package has been removed. > +test -x $DAEMON || exit 0 > + > if [ "$RUN_DAEMON" != "yes" ] ; then > echo "tftpd-hpa disabled in /etc/default/tftpd-hpa" >exit 0 -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2 2/2] autofs: change DESCRIPTION to SUMMARY
Merged this too. Thanks. -J. [[oe] [meta-networking][PATCH v2 2/2] autofs: change DESCRIPTION to SUMMARY] On 13.10.17 (Thu 13:45) Andreas Oberritter wrote: > Signed-off-by: Andreas Oberritter > --- > meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb > b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb > index 905be40..f8df0ef 100644 > --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb > +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb > @@ -1,4 +1,4 @@ > -DESCRIPTION = "Kernel based automounter for linux." > +SUMMARY = "Kernel based automounter for linux." > SECTION = "base" > LICENSE = "GPL-2.0" > LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -- -Joe MacDonald. :wq signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2 1/2] autofs: pass systemd directory to configure
Merged, thanks.
-J.
[[oe] [meta-networking][PATCH v2 1/2] autofs: pass systemd directory to
configure] On 13.10.17 (Thu 13:45) Andreas Oberritter wrote:
> Otherwise, configure will try to auto-detect using host paths.
>
> Signed-off-by: Andreas Oberritter
> ---
> meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> index 0c66ebc..905be40 100644
> --- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> +++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
> @@ -85,6 +85,7 @@ EXTRA_OECONF += "--disable-mount-locking \
> "
> CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
> ac_cv_path_RPCGEN=rpcgen \
> +systemddir=${systemd_unitdir}/system \
> "
>
> do_configure_prepend () {
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 2/2 meta-networking] vsftpd: change default secure_chroot_dir
Hi Roy,
Is this different from the patch I received from Ming Liu about a month
ago? It doesn't look it at first glance, but I didn't diff the two.
-J.
[[oe] [PATCH 2/2 meta-networking] vsftpd: change default secure_chroot_dir] On
13.10.10 (Thu 16:34) rongqing...@windriver.com wrote:
> From: Roy Li
>
> Change default value of secure_chroot_dir to /var/run/vsftpd/empty, add
> volatiles entry for it, to ensure it won't fail to start by xinetd.
>
> Signed-off-by: Roy Li
> ---
> .../vsftpd/files/change-secure_chroot_dir.patch| 55
>
> meta-networking/recipes-daemons/vsftpd/files/init |2 +-
> .../vsftpd/files/volatiles.99_vsftpd |2 +
> .../recipes-daemons/vsftpd/vsftpd_3.0.0.bb |7 ++-
> 4 files changed, 64 insertions(+), 2 deletions(-)
> create mode 100644
> meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
> create mode 100644
> meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
>
> diff --git
> a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
> b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
> new file mode 100644
> index 000..e7a673e
> --- /dev/null
> +++
> b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
> @@ -0,0 +1,55 @@
> +vsftpd: change secure_chroot_dir default value
> +
> +Upstream-Status: Pending
> +
> +Change secure_chroot_dir pointing to a volatile directory.
> +
> +Signed-off-by: Ming Liu
> +---
> + INSTALL |6 +++---
> + tunables.c|2 +-
> + vsftpd.conf.5 |2 +-
> + 3 files changed, 5 insertions(+), 5 deletions(-)
> +
> +diff -urpN a/INSTALL b/INSTALL
> +--- a/INSTALL2013-09-13 10:23:57.504972397 +0800
> b/INSTALL2013-09-13 10:25:25.664971779 +0800
> +@@ -27,11 +27,11 @@ user in case it does not already exist.
> + [root@localhost root]# useradd nobody
> + useradd: user nobody exists
> +
> +-2b) vsftpd needs the (empty) directory /usr/share/empty in the default
> ++2b) vsftpd needs the (empty) directory /var/run/vsftpd/empty in the default
> + configuration. Add this directory in case it does not already exist. e.g.:
> +
> +-[root@localhost root]# mkdir /usr/share/empty/
> +-mkdir: cannot create directory `/usr/share/empty': File exists
> ++[root@localhost root]# mkdir /var/run/vsftpd/empty/
> ++mkdir: cannot create directory `/var/run/vsftpd/empty': File exists
> +
> + 2c) For anonymous FTP, you will need the user "ftp" to exist, and have a
> + valid home directory (which is NOT owned or writable by the user "ftp").
> +diff -urpN a/tunables.c b/tunables.c
> +--- a/tunables.c 2013-09-13 10:26:29.554972817 +0800
> b/tunables.c 2013-09-13 10:27:18.104972210 +0800
> +@@ -254,7 +254,7 @@ tunables_load_defaults()
> + /* -rw--- */
> + tunable_chown_upload_mode = 0600;
> +
> +- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
> ++ install_str_setting("/var/run/vsftpd/empty", &tunable_secure_chroot_dir);
> + install_str_setting("ftp", &tunable_ftp_username);
> + install_str_setting("root", &tunable_chown_username);
> + install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
> +diff -urpN a/vsftpd.conf.5 b/vsftpd.conf.5
> +--- a/vsftpd.conf.5 2013-09-13 10:09:33.774972462 +0800
> b/vsftpd.conf.5 2013-09-13 10:10:41.914971989 +0800
> +@@ -969,7 +969,7 @@ This option should be the name of a dire
> + directory should not be writable by the ftp user. This directory is used
> + as a secure chroot() jail at times vsftpd does not require filesystem
> access.
> +
> +-Default: /usr/share/empty
> ++Default: /var/run/vsftpd/empty
> + .TP
> + .B ssl_ciphers
> + This option can be used to select which SSL ciphers vsftpd will allow for
> diff --git a/meta-networking/recipes-daemons/vsftpd/files/init
> b/meta-networking/recipes-daemons/vsftpd/files/init
> index d0ec010..513f407 100755
> --- a/meta-networking/recipes-daemons/vsftpd/files/init
> +++ b/meta-networking/recipes-daemons/vsftpd/files/init
> @@ -2,7 +2,7 @@
> DAEMON=/usr/sbin/vsftpd
> NAME=vsftpd
> DESC="FTP Server"
> -ARGS=""
> +ARGS="/etc/vsftpd.conf"
> FTPDIR=/var/lib/ftp
>
> test -f $DAEMON || exit 0
> diff --git a/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
> b/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
> new file mode 100644
> index 000..0f80776
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
> @@ -0,0 +1,2 @@
> +#
> +d root root 0755 /var/run/vsftpd/empty none
> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> index 7677477..09de1e9 100644
> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> @@ -14,6 +14,8 @@ SRC_URI =
> "https://security.appspot.com/downloads/vsftpd-${PV}.tar.
Re: [oe] [PATCH 1/2 meta-networking] vsftpd: use quotes to wrap variable
Merged, thanks.
-J.
[[oe] [PATCH 1/2 meta-networking] vsftpd: use quotes to wrap variable] On
13.10.10 (Thu 16:34) rongqing...@windriver.com wrote:
> From: Roy Li
>
> "test -z ${PAMLIB}" in do_install() may report error if ${PAMLIB}
> has space chars. This commit added double quotes to wrap it in
> case of errors.
>
> Signed-off-by: Qiang Chen
> Signed-off-by: Roy Li
> ---
> meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> index 2c3e009..7677477 100644
> --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.0.bb
> @@ -60,7 +60,7 @@ do_install() {
>
> install -m 600 ${WORKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/
> install -m 600 ${WORKDIR}/vsftpd.user_list ${D}${sysconfdir}/
> -if ! test -z ${PAMLIB} ; then
> +if ! test -z "${PAMLIB}" ; then
> install -d ${D}${sysconfdir}/pam.d/
> cp ${S}/RedHat/vsftpd.pam ${D}${sysconfdir}/pam.d/vsftpd
> sed -i "s:/lib/security:${base_libdir}/security:"
> ${D}${sysconfdir}/pam.d/vsftpd
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] libhugetlbfs: add support for armv7a
Signed-off-by: Anders Roxell
---
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index 24480c3..4f1bfa4 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -20,10 +20,16 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
S = "${WORKDIR}/git"
-COMPATIBLE_HOST = "(x86_64|powerpc|powerpc64|aarch64).*-linux*"
+COMPATIBLE_HOST = "(x86_64|powerpc|powerpc64|arm|aarch64).*-linux*"
+python __anonymous() {
+if base_contains('TARGET_ARCH', 'arm', True, False, d):
+d.setVar('ARCH', 'armv7l')
+else:
+d.setVar('ARCH', d.getVar('TARGET_ARCH'))
+}
-EXTRA_OEMAKE = "'ARCH=${TARGET_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}'
BUILDTYPE=NATIVEONLY ${LIBARGS}"
+EXTRA_OEMAKE = "'ARCH=${ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' BUILDTYPE=NATIVEONLY
${LIBARGS}"
CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer
-g0"
TARGET_CC_ARCH += "${LDFLAGS}"
--
1.8.1.2
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-virtualization] [PATCH 1/2] conf/layer.conf: fix "No newline at end of file"
FYI: this should go to meta-virtualizat...@yoctoproject.org, but I can pick up
the patch from here.
Cheers,
Bruce
On Fri, Oct 18, 2013 at 4:22 AM, Robert Yang wrote:
> The last line lacked a newline (usually '\n', aka CR or CRLF) in the
> end, so there was a warning from git diff:
>
> \ No newline at end of file
>
> The last byte of the file should be a newline.
>
> Note:
> It seems that nothing is changed in this commit, but it does change the
> end of the last line.
>
> Signed-off-by: Robert Yang
> ---
> conf/layer.conf |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 4c1fa19..15ed1df 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -9,4 +9,4 @@ BBFILE_PATTERN_virtualization-layer := "^${LAYERDIR}/"
> BBFILE_PRIORITY_virtualization-layer = "7"
>
> # Custom licenses used by some packages in this layer
> -LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
> \ No newline at end of file
> +LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
> --
> 1.7.10.4
>
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] rsyslog: fix dependency name (json-c => libjson)
On 18/10/13 11:04, Olof Johansson wrote: > On Fri, Oct 18, 2013 at 09:51:23AM +0100, Jack Mitchell wrote: >> The rsyslogd patches shouldn't really have gone in yet... I've fired off >> a patch to oe-core to update libjson to the now named json-c, so if we >> could hold off for a few days that would be great. Otherwise, maybe >> temporarily revert the rsyslogd patches? > > Ah, I didn't notice those patches. I see! > > > On 13-10-18 11:44 +0200, Martin Jansa wrote: >> Sorry about that, I was testing them together with json-c patch, so I >> haven't noticed, can we temporary take this patch and then revert it >> when (and if) libjson is renamed in oe-core (assuming that newer rsyslog >> works with older libjson-0.9. > > Either way is fine by me. I can fix it locally for us until the > rename hits oecore. > > > Thanks, > I'm happy either way too. Whatever suits you best JaMa. -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] rsyslog: fix dependency name (json-c => libjson)
On Fri, Oct 18, 2013 at 09:51:23AM +0100, Jack Mitchell wrote: > The rsyslogd patches shouldn't really have gone in yet... I've fired off > a patch to oe-core to update libjson to the now named json-c, so if we > could hold off for a few days that would be great. Otherwise, maybe > temporarily revert the rsyslogd patches? Ah, I didn't notice those patches. I see! On 13-10-18 11:44 +0200, Martin Jansa wrote: > Sorry about that, I was testing them together with json-c patch, so I > haven't noticed, can we temporary take this patch and then revert it > when (and if) libjson is renamed in oe-core (assuming that newer rsyslog > works with older libjson-0.9. Either way is fine by me. I can fix it locally for us until the rename hits oecore. Thanks, -- olofjn ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] rsyslog: fix dependency name (json-c => libjson)
On Fri, Oct 18, 2013 at 09:51:23AM +0100, Jack Mitchell wrote:
> On 18/10/13 08:27, Olof Johansson wrote:
> > Signed-off-by: Olof Johansson
> > ---
> > meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb |2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> > b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> > index 0101004..238b484 100644
> > --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> > +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> > @@ -1,5 +1,5 @@
> > DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
> > -DEPENDS = "zlib libestr json-c"
> > +DEPENDS = "zlib libestr libjson"
> > DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '',
> > d)}"
> > HOMEPAGE = "http://www.rsyslog.com/";
> > LICENSE = "GPLv3"
> >
>
> Hi Olof,
>
> The rsyslogd patches shouldn't really have gone in yet... I've fired off
> a patch to oe-core to update libjson to the now named json-c, so if we
> could hold off for a few days that would be great. Otherwise, maybe
> temporarily revert the rsyslogd patches?
Sorry about that, I was testing them together with json-c patch, so I
haven't noticed, can we temporary take this patch and then revert it
when (and if) libjson is renamed in oe-core (assuming that newer rsyslog
works with older libjson-0.9.
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 0/2] Breakpad and ktap recipes
On Fri, Oct 18, 2013 at 07:14:09AM +0200, Anders Darander wrote: > I'm going to resend this series with the correct prefix added. Are they the same, just with prefix added? I've already included them in last jenkins builds, so to know if I should fetch new version from patchwork or not. > Anders Darander wrote: > > > >These are a couple of recipes that we've been using internally for some > >time. They > >were developed and mostly used on a dylan-based setup. Testing has > >primarily been > >performed on ARM, both qemuarm and our custom machine. > > > >Breakpad is a crash reporting tool, that's getting a wider use. > >Please, let me know if there's a more efficient way (or otherwise > >better way) to > >have the bbclass generate the symbol file. > > > >Ktap is a new scripting dynamic tracing tool for Linux. This recipe > >will be of > >use until everyone is on 3.13+ kernels (ktap has been merged for the > >3.13 series). > > > >The following changes since commit > >f8903f53db717294d63a8d79b5ef7ca34b3c189e: > > > >libhugetlbfs: install perl lib to directory perl instead of perl5 > >(2013-10-15 13:43:53 +0200) > > > >are available in the git repository at: > > > > git://github.com/darander/meta-oe breakpad-ktap > > https://github.com/darander/meta-oe/tree/breakpad-ktap > > > >Anders Darander (2): > > breakpad: add initial recipe > > ktap: add initial recipe > > > > meta-oe/classes/breakpad.bbclass | 32 ++ > >meta-oe/recipes-devtools/breakpad/breakpad_svn.bb | 72 > >+++ > > meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb| 19 ++ > > meta-oe/recipes-kernel/ktap/ktap.inc | 11 > > meta-oe/recipes-kernel/ktap/ktap_0.3.bb | 17 ++ > > 5 files changed, 151 insertions(+) > > create mode 100644 meta-oe/classes/breakpad.bbclass > > create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad_svn.bb > > create mode 100644 meta-oe/recipes-kernel/ktap/ktap-module_0.3.bb > > create mode 100644 meta-oe/recipes-kernel/ktap/ktap.inc > > create mode 100644 meta-oe/recipes-kernel/ktap/ktap_0.3.bb > > -- > ChargeStorm AB / eStorm > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] rsyslog: fix dependency name (json-c => libjson)
On 18/10/13 08:27, Olof Johansson wrote:
> Signed-off-by: Olof Johansson
> ---
> meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> index 0101004..238b484 100644
> --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
> @@ -1,5 +1,5 @@
> DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
> -DEPENDS = "zlib libestr json-c"
> +DEPENDS = "zlib libestr libjson"
> DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '',
> d)}"
> HOMEPAGE = "http://www.rsyslog.com/";
> LICENSE = "GPLv3"
>
Hi Olof,
The rsyslogd patches shouldn't really have gone in yet... I've fired off
a patch to oe-core to update libjson to the now named json-c, so if we
could hold off for a few days that would be great. Otherwise, maybe
temporarily revert the rsyslogd patches?
Cheers,
--
Jack Mitchell (j...@embed.me.uk)
Embedded Systems Engineer
Cambridgeshire, UK
http://www.embed.me.uk
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libhugetlbfs: kill /opt usage
From: Koen Kooi
/opt should never be used for packages built by OE, so install the tests in a
more standard location.
Signed-off-by: Koen Kooi
---
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index 24480c3..d29dee1 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -37,8 +37,8 @@ do_configure() {
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} \
- INST_TESTSDIR32=/opt/libhugetlbfs/tests \
- INST_TESTSDIR64=/opt/libhugetlbfs/tests \
+ INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \
+ INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \
install-tests
}
@@ -47,6 +47,6 @@ PARALLEL_MAKE_pn-${PN} = ""
PACKAGES =+ "${PN}-perl ${PN}-tests "
FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug
${libdir}/libhugetlbfs/tests/obj64/.debug"
FILES_${PN}-perl = "${libdir}/perl"
-FILES_${PN}-tests += "/opt/libhugetlbfs/tests"
+FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
--
1.7.10
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCHv3 1/3] json-c: add 0.11
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
>>
>> Signed-off-by: Jack Mitchell
>> ---
>> 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 000..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 (j...@embed.me.uk)
Embedded Systems Engineer
Cambridgeshire, UK
http://www.embed.me.uk
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 3/3] barnyard: add recipe
From: Chunrong Guo
*Barnyard is a output system for Snort
Signed-off-by: Chunrong Guo
---
.../barnyard/barnyard_0.2.0.bb | 20
1 files changed, 20 insertions(+), 0 deletions(-)
create mode 100644
meta-networking/recipes-connectivity/barnyard/barnyard_0.2.0.bb
diff --git a/meta-networking/recipes-connectivity/barnyard/barnyard_0.2.0.bb
b/meta-networking/recipes-connectivity/barnyard/barnyard_0.2.0.bb
new file mode 100644
index 000..09c5506
--- /dev/null
+++ b/meta-networking/recipes-connectivity/barnyard/barnyard_0.2.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Barnyard is a output system for Snort."
+HOMEPAGE = "http://www.snort.org/";
+LICENSE = "QPL-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE.QPL;md5=1b8ff8c0012b5a2d647357699bf44b41"
+
+DEPENDS = "libpcap"
+
+SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
+ "
+SRC_URI[tarball.md5sum] = "be3283028cf414b52b220308ceb411e9"
+SRC_URI[tarball.sha256sum] =
"09e0f8e095e79cfe70ea069d13e7d02521a504a1f400a45556a634dccfd31a3a"
+
+
+inherit autotools pkgconfig
+
+do_configure_prepend () {
+ #fix hardcoded include path
+ sed -i -e 's:extra_incl=/usr/include/pcap::g' ${S}/configure.in
+}
+
--
1.7.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 2/3] libdnet: add recipe
From: Chunrong Guo
*dumb networking library
*snort depends libdnet
Signed-off-by: Chunrong Guo
---
.../recipes-connectivity/libdnet/libdnet_1.12.bb | 14 ++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
new file mode 100644
index 000..40b5758
--- /dev/null
+++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "dumb networking library"
+HOMEPAGE = "http://code.google.com/p/libdnet/";
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9"
+
+SRC_URI = "http://libdnet.googlecode.com/files/libdnet-${PV}.tgz";
+
+SRC_URI[md5sum] = "9253ef6de1b5e28e9c9a62b882e44cc9"
+SRC_URI[sha256sum] =
"83b33039787cf0e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026"
+
+inherit autotools
+
+acpaths = "-I ./config/"
+
--
1.7.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-virtualization] [PATCH 1/2] conf/layer.conf: fix "No newline at end of file"
The last line lacked a newline (usually '\n', aka CR or CRLF) in the
end, so there was a warning from git diff:
\ No newline at end of file
The last byte of the file should be a newline.
Note:
It seems that nothing is changed in this commit, but it does change the
end of the last line.
Signed-off-by: Robert Yang
---
conf/layer.conf |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index 4c1fa19..15ed1df 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,4 @@ BBFILE_PATTERN_virtualization-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_virtualization-layer = "7"
# Custom licenses used by some packages in this layer
-LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
\ No newline at end of file
+LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
--
1.7.10.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH v2 1/3] snort : add recipe
From: Chunrong Guo
*snort - a free lightweight network intrusion detection
system for UNIX and Windows
Signed-off-by: Chunrong Guo
---
.../snort/files/disable-dap-address-space-id.patch | 52 ++
.../snort/files/disable-inaddr-none.patch | 75
.../recipes-connectivity/snort/snort_2.9.4.6.bb| 64 +
3 files changed, 191 insertions(+), 0 deletions(-)
create mode 100644
meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch
create mode 100644
meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch
create mode 100644 meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb
diff --git
a/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch
b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch
new file mode 100644
index 000..39e5c9c
--- /dev/null
+++
b/meta-networking/recipes-connectivity/snort/files/disable-dap-address-space-id.patch
@@ -0,0 +1,52 @@
+Upstream-Status:Inappropriate [embedded specific]
+
+fix the below error:
+checking for dap address space id... configure:
+configure: error: cannot run test program while cross compiling
+
+
+Signed-off-by: Chunrong Guo
+
+--- a/configure.in 2013-08-23 00:06:37.239361932 -0500
b/configure.in 2013-08-23 00:07:32.860266534 -0500
+@@ -679,23 +679,23 @@
+
+ AC_CHECK_FUNCS([daq_hup_apply] [daq_acquire_with_meta])
+
+-AC_MSG_CHECKING([for daq address space ID])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- DAQ_PktHdr_t hdr;
+- hdr.address_space_id = 0;
+-]])],
+-[have_daq_address_space_id="yes"],
+-[have_daq_address_space_id="no"])
+-AC_MSG_RESULT($have_daq_address_space_id)
+-if test "x$have_daq_address_space_id" = "xyes"; then
+-AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
+-[DAQ version supports address space ID in header.])
+-fi
++#AC_MSG_CHECKING([for daq address space ID])
++#AC_RUN_IFELSE(
++#[AC_LANG_PROGRAM(
++#[[
++##include
++#]],
++#[[
++# DAQ_PktHdr_t hdr;
++# hdr.address_space_id = 0;
++#]])],
++have_daq_address_space_id="yes"
++#[have_daq_address_space_id="no"])
++#AC_MSG_RESULT($have_daq_address_space_id)
++#if test "x$have_daq_address_space_id" = "xyes"; then
++#AC_DEFINE([HAVE_DAQ_ADDRESS_SPACE_ID],[1],
++#[DAQ version supports address space ID in header.])
++#fi
+
+ # any sparc platform has to have this one defined.
+ AC_MSG_CHECKING(for sparc)
diff --git
a/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch
b/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch
new file mode 100644
index 000..9dafe63
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/files/disable-inaddr-none.patch
@@ -0,0 +1,75 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+fix the below error:
+checking for INADDR_NONE... configure:
+configure: error: cannot run test program while cross compiling
+
+Signed-off-by: Chunrong Guo
+
+
+--- a/configure.in 2013-08-21 03:56:17.197414789 -0500
b/configure.in 2013-08-21 23:19:05.298553560 -0500
+@@ -281,25 +281,7 @@
+ AC_CHECK_TYPES([boolean])
+
+ # In case INADDR_NONE is not defined (like on Solaris)
+-have_inaddr_none="no"
+-AC_MSG_CHECKING([for INADDR_NONE])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-#include
+-#include
+-]],
+-[[
+- if (inet_addr("10,5,2") == INADDR_NONE);
+-return 0;
+-]])],
+-[have_inaddr_none="yes"],
+-[have_inaddr_none="no"])
+-AC_MSG_RESULT($have_inaddr_none)
+-if test "x$have_inaddr_none" = "xno"; then
+- AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])
+-fi
++have_inaddr_none="yes"
+
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include
+@@ -397,21 +379,21 @@
+ fi
+ fi
+
+-AC_MSG_CHECKING([for pcap_lex_destroy])
+-AC_RUN_IFELSE(
+-[AC_LANG_PROGRAM(
+-[[
+-#include
+-]],
+-[[
+- pcap_lex_destroy();
+-]])],
+-[have_pcap_lex_destroy="yes"],
+-[have_pcap_lex_destroy="no"])
+-AC_MSG_RESULT($have_pcap_lex_destroy)
+-if test "x$have_pcap_lex_destroy" = "xyes"; then
+-AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack
created by pcap bpf filter])
+-fi
++#AC_MSG_CHECKING([for pcap_lex_destroy])
++#AC_RUN_IFELSE(
++#[AC_LANG_PROGRAM(
++#[[
++##include
++#]],
++#[[
++# pcap_lex_destroy();
++#]])],
++have_pcap_lex_destroy="yes"
++#[have_pcap_lex_destroy="no"])
++#AC_MSG_RESULT($have_pcap_lex_destroy)
++#if test "x$have_pcap_lex_destroy" = "xyes"; then
++#AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack
created by pcap bpf filter])
++#fi
+
+ AC_MSG_CHECKING([for pcap_lib_version])
+ AC_LINK_IFELSE(
diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb
b/meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb
new file mode 100644
index 000..8639639
--- /dev/null
+++ b/meta-networking/recipes-connectivity/snort/snort_2.9.4.6.bb
@@ -0,0 +
[oe] [meta-virtualization] [PATCH 2/2] conf/layer.conf: add LAYERVERSION and LAYERDEPENDS
Add LAYERVERSION and LAYERDEPENDS, it needs depend on oe-core and
meta-networking layer.
Signed-off-by: Robert Yang
---
conf/layer.conf |6 ++
1 file changed, 6 insertions(+)
diff --git a/conf/layer.conf b/conf/layer.conf
index 15ed1df..3d21667 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,3 +10,9 @@ BBFILE_PRIORITY_virtualization-layer = "7"
# Custom licenses used by some packages in this layer
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_virtualization-layer = "1"
+
+LAYERDEPENDS_virtualization-layer = "core networking-layer"
--
1.7.10.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-webserver][PATCH] nginx: new recipe
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
stephen.arnold42 schreef op 18-10-13 04:13:
> From: "stephen.arnold42"
>
> Initial recipe created by Steve Arnold. Original build patch and 1.0.10
> recipe graciously contributed by bencoh (in #oe on irc.freenode.net). New
> recipe and init script contributed by this author. Built and tested on
> master branches using author's fork of meta-raspberrypi.
>
> https://github.com/sarnold/meta-raspberrypi
>
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: stephen.arnold42 ---
> .../nginx/files/nginx-cross_1.4.0.diff | 229
> + .../recipes-httpd/nginx/files/nginx.conf
> | 118 +++ .../recipes-httpd/nginx/files/nginx.init |
> 52 + meta-webserver/recipes-httpd/nginx/nginx_1.4.0.bb | 91
> 4 files changed, 490 insertions(+) create mode 100644
> meta-webserver/recipes-httpd/nginx/files/nginx-cross_1.4.0.diff create
> mode 100644 meta-webserver/recipes-httpd/nginx/files/nginx.conf create
> mode 100755 meta-webserver/recipes-httpd/nginx/files/nginx.init create
> mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.4.0.bb
>
> diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.conf
> b/meta-webserver/recipes-httpd/nginx/files/nginx.conf new file mode
> 100644 index 000..589de41 --- /dev/null +++
> b/meta-webserver/recipes-httpd/nginx/files/nginx.conf @@ -0,0 +1,118 @@
> + +user www-data; +worker_processes 1; + +error_log
> /var/log/nginx/error.log; +#error_log logs/error.log notice;
> +#error_log logs/error.log info; + +pid
> /var/run/nginx//nginx.pid;
Double // and isn't that /run nowadays?
> + + +events { +worker_connections 1024; +} + + +http { +include
> mime.types; +default_type application/octet-stream; + +
> log_format main '$remote_addr - $remote_user [$time_local] "$request"
> ' + '$status $body_bytes_sent "$http_referer" ' +
> '"$http_user_agent" "$http_x_forwarded_for"'; + +access_log
> /var/log/nginx/access.log main; + +sendfileon; +
> #tcp_nopush on; + +#keepalive_timeout 0; +keepalive_timeout
> 65; + +#gzip on; + +server { +listen 80; +
> server_name localhost; + +#charset koi8-r; + +
> #access_log logs/host.access.log main; + +location / { +
> root /var/www//localhost/html;
double //
> diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.init
> b/meta-webserver/recipes-httpd/nginx/files/nginx.init new file mode
> 100755 index 000..0f38b9c --- /dev/null +++
> b/meta-webserver/recipes-httpd/nginx/files/nginx.init @@ -0,0 +1,52 @@
> +#! /bin/sh +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/nginx
hardcode ${sbindir}, more hardcoded paths in the rest of the file
> index 000..185fd22 --- /dev/null +++
> b/meta-webserver/recipes-httpd/nginx/nginx_1.4.0.bb @@ -0,0 +1,91 @@
> +SUMMARY = "HTTP and reverse proxy server for embedded environments"
> +HOMEPAGE = "http://nginx.org/"; +LICENSE = "BSD-2-Clause" +SECTION =
> "net" + +DEPENDS = "libpcre gzip openssl" + +PR = "r0"
default, drop it
> + +SRC_URI = " \ +http://nginx.org/download/nginx-${PV}.tar.gz \ +
> file://nginx-cross_${PV}.diff;name=crosspatch \ + file://nginx.conf \ +
> file://nginx.init \ +" + +inherit update-rc.d useradd siteinfo +
> +SRC_URI[md5sum] = "d496e58864ab10ed56278b7655b0d0b2" +SRC_URI[sha256sum]
> = "84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9"
> +LIC_FILES_CHKSUM =
> "file://LICENSE;md5=917bfdf005ffb6fd025550414ff05a9f"
LIC_FILES_CHKSUM should go next to the LICENSE field
> + +CONFFILES_${PN} = "${sysconfdir}/nginx/nginx.conf \ +
> ${sysconfdir}/nginx/fastcgi.conf\ +
> ${sysconfdir}/nginx/fastcgi_params
> \ + ${sysconfdir}/nginx/koi-utf \ +
> ${sysconfdir}/nginx/koi-win \ +
> ${sysconfdir}/nginx/mime.types \ +${sysconfdir}/nginx/scgi_params
> \ +
> ${sysconfdir}/nginx/uwsgi_params \ + ${sysconfdir}/nginx/win-utf \ +"
Packaging variables go below do_install
> + +INITSCRIPT_NAME = "nginx" +INITSCRIPT_PARAMS = "defaults 92 20"
Below do_install
> + +do_configure() { +PTRSIZE=$(expr ${SITEINFO_BITS} / 8) + +echo
> $PTRSIZE +echo $CFLAGS +echo $LDFLAGS + +./configure \ +
> --crossbuild=Linux:${TUNE_ARCH} \ +
> --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little',
> 'big', d)} \ +--with-int=4 \ +--with-long=${PTRSIZE} \ +
> --with-long-long=8 \ +--with-ptr-size=${PTRSIZE} \ +
> --with-sig-atomic-t=${PTRSIZE} \ +--with-size-t=${PTRSIZE} \ +
> --with-off-t=${PTRSIZE} \ +--with-time-t=${PTRSIZE} \ +
> --with-sys-nerr=132 \ +--conf-path=/etc/nginx/nginx.conf \
${sysconfdir}
> +--http-log-path=/var/log/nginx/access.log \ +
> --error-log-path=/var/log/nginx/error.log \
${localstatedir}
> +--pid-path=/var/run/nginx/nginx.pid \
/run ?
> +--prefix=/
[oe] [meta-oe][PATCH] rsyslog: fix dependency name (json-c => libjson)
Signed-off-by: Olof Johansson
---
meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
index 0101004..238b484 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
-DEPENDS = "zlib libestr json-c"
+DEPENDS = "zlib libestr libjson"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
HOMEPAGE = "http://www.rsyslog.com/";
LICENSE = "GPLv3"
--
1.7.10.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
