Patchwork [meta-oe] rsyslog: fix dependency name (json-c => libjson)

login
register
mail settings
Submitter Olof Johansson
Date Oct. 18, 2013, 7:27 a.m.
Message ID <1382081248-6370-1-git-send-email-olof.johansson@axis.com>
Download mbox | patch
Permalink /patch/60201/
State Accepted, archived
Commit ed796941d04efa39b3b643f1b1e543eab6675a11
Headers show

Comments

Olof Johansson - Oct. 18, 2013, 7:27 a.m.
Signed-off-by: Olof Johansson <olof.johansson@axis.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ml@communistcode.co.uk - Oct. 18, 2013, 8:51 a.m.
On 18/10/13 08:27, Olof Johansson wrote:
> Signed-off-by: Olof Johansson <olof.johansson@axis.com>
> ---
>  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,
Martin Jansa - Oct. 18, 2013, 9:44 a.m.
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 <olof.johansson@axis.com>
> > ---
> >  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.
Olof Johansson - Oct. 18, 2013, 10:04 a.m.
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,
ml@communistcode.co.uk - Oct. 18, 2013, 10:09 a.m.
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.

Patch

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"