Re: [OE-core] [PATCH] connman: update to 1.36
I am sorry, but they were not upstreamed. Your commit does not remove
the content of those two patches, it just squashes them all together
in one patch with the third one, losing the two commit messages in the
process:
- configure.ac | 1 +
- gdhcp/client.c | 1 -
- plugins/tist.c | 1 -
- src/backtrace.c| 1 -
- src/inet.c | 1 -
- src/log.c | 1 -
- src/ntp.c | 1 -
- src/resolver.c | 1 -
- src/rfkill.c | 1 -
- src/stats.c| 1 -
- src/timezone.c | 1 -
- tools/stats-tool.c | 1 -
- tools/tap-test.c | 1 -
- tools/wispr.c | 1 -
- vpn/plugins/vpn.c | 1 -
- 15 files changed, 1 insertion(+), 14 deletions(-)
+ configure.ac | 3 +++
+ gdhcp/client.c | 1 -
+ gdhcp/common.h | 5 +++--
+ gweb/gresolv.c | 2 ++
+ plugins/tist.c | 1 -
+ plugins/wifi.c | 3 +--
+ src/backtrace.c | 1 -
+ src/inet.c | 1 -
+ src/ippool.c | 1 -
+ src/iptables.c | 2 +-
+ src/log.c| 1 -
+ src/ntp.c| 1 -
+ src/resolver.c | 1 -
+ src/rfkill.c | 1 -
+ src/stats.c | 1 -
+ src/tethering.c | 2 --
+ src/timezone.c | 1 -
+ tools/dhcp-test.c| 1 -
+ tools/dnsproxy-test.c| 1 +
+ tools/private-network-test.c | 2 +-
+ tools/stats-tool.c | 1 -
+ tools/tap-test.c | 3 +--
+ tools/wispr.c| 1 -
+ vpn/plugins/vpn.c| 1 -
+ 24 files changed, 13 insertions(+), 25 deletions(-)
Alex
2018-09-19 12:27 GMT+02:00 Oleksandr Kravchuk
:
> Those two patches were mainstreamed, which will be described in the new
> commit message as was requested.
>
> On Wed, Sep 19, 2018 at 9:49 AM, Alexander Kanavin
> wrote:
>>
>> Well, no. The patch file contains three different patches, all fixing
>> different things, and this information about the second and third one
>> for instance has vanished:
>>
>> -From b8b7878e6cb2a1ed4fcfa256f7e232511a40e3d9 Mon Sep 17 00:00:00 2001
>> -From: Ross Burton
>> -Date: Tue, 9 Aug 2016 15:37:50 +0100
>> -Subject: [PATCH 2/3] Check for in6_pktinfo.ipi6_addr explicitly
>> -
>> -Instead of assuming that just glibc has this structure, check for it at
>> -configure as musl also has it.
>> -
>> -Based on work by Khem Raj .
>>
>>
>> -From c0726e432fa0274a2b9c70179b03df6720972816 Mon Sep 17 00:00:00 2001
>> -From: Ross Burton
>> -Date: Tue, 9 Aug 2016 15:19:23 +0100
>> -Subject: [PATCH 3/3] Rationalise includes
>> -
>> -gweb/gresolv.c uses snprintf() and isspace() so it should include stdio.h
>> and
>> -ctype.h.
>> -
>> -tools/dnsproxy-test uses functions from stdio.h.
>> -
>> -musl warns when sys/ headers are included when the non-sys form should be
>> used,
>> -so switch sys/errno.h and so on to errno.h.
>> -
>> -musl also causes redefinition errors when pieces of the networking
>> headers are
>> -included, so remove the redundant includes.
>> -
>> -Based on work by Khem Raj .
>>
>> Alex
>>
>>
>>
>> 2018-09-19 0:24 GMT+02:00 Oleksandr Kravchuk
>> :
>> > Sorry for the delay. This patch hasn't really been changed much: it was
>> > simply rebased, renamed and converted into git format. Would it be
>> > enough to keep it the way it is and describe the changes in the commit
>> > message?
>> >
>> > On 13/09/2018 23:38, Alexander Kanavin wrote:
>> >> This one:
>> >> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
>> >> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
>> >>
>> >> I think you should make two commits: one that splits this patch in
>> >> three, and another which actually does the version update.
>> >>
>> >> Alex
>> >>
>> >> 2018-09-13 23:08 GMT+02:00 Oleksandr Kravchuk
>> >> :
>> >>> Sure, will do.
>> >>>
>> > Also, one patch is changed in a way that makes it lose significant
>> > amount
>> > of information (it's an amalgamation of three patches)
>> >>> Could you please clarify which one do you mean? Thank you.
>> >>>
>> >>>
>> >>> On 9/13/18 9:46 PM, Alexander Kanavin wrote:
>> Please explain the changes to patches (not as a reply to me, but in
>> the commit message itself).
>> If they are deleted because upstream already has them, it should be
>> mentioned explicitly.
>>
>> Also, one patch is changed in a way that makes it lose significant
>> amount of information
>> (it's an amalgamation of three patches). Perhaps we should just split
>> it in three?
>>
>> Alex
>>
>> 2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
>> :
>> > Signed-off-by: Oleksandr Kravchuk
>> > ---
>> > meta/recipes-connectivity/connman/connman.inc | 2 +-
>> > ...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446
>> > --
>> > ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
>> > ...refixlen-to-iproute_default_function.patch | 63 ---
Re: [OE-core] [PATCH] connman: update to 1.36
Those two patches were mainstreamed, which will be described in the new
commit message as was requested.
On Wed, Sep 19, 2018 at 9:49 AM, Alexander Kanavin
wrote:
> Well, no. The patch file contains three different patches, all fixing
> different things, and this information about the second and third one
> for instance has vanished:
>
> -From b8b7878e6cb2a1ed4fcfa256f7e232511a40e3d9 Mon Sep 17 00:00:00 2001
> -From: Ross Burton
> -Date: Tue, 9 Aug 2016 15:37:50 +0100
> -Subject: [PATCH 2/3] Check for in6_pktinfo.ipi6_addr explicitly
> -
> -Instead of assuming that just glibc has this structure, check for it at
> -configure as musl also has it.
> -
> -Based on work by Khem Raj .
>
>
> -From c0726e432fa0274a2b9c70179b03df6720972816 Mon Sep 17 00:00:00 2001
> -From: Ross Burton
> -Date: Tue, 9 Aug 2016 15:19:23 +0100
> -Subject: [PATCH 3/3] Rationalise includes
> -
> -gweb/gresolv.c uses snprintf() and isspace() so it should include stdio.h
> and
> -ctype.h.
> -
> -tools/dnsproxy-test uses functions from stdio.h.
> -
> -musl warns when sys/ headers are included when the non-sys form should be
> used,
> -so switch sys/errno.h and so on to errno.h.
> -
> -musl also causes redefinition errors when pieces of the networking
> headers are
> -included, so remove the redundant includes.
> -
> -Based on work by Khem Raj .
>
> Alex
>
>
>
> 2018-09-19 0:24 GMT+02:00 Oleksandr Kravchuk
> :
> > Sorry for the delay. This patch hasn't really been changed much: it was
> > simply rebased, renamed and converted into git format. Would it be
> > enough to keep it the way it is and describe the changes in the commit
> > message?
> >
> > On 13/09/2018 23:38, Alexander Kanavin wrote:
> >> This one:
> >> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
> >> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
> >>
> >> I think you should make two commits: one that splits this patch in
> >> three, and another which actually does the version update.
> >>
> >> Alex
> >>
> >> 2018-09-13 23:08 GMT+02:00 Oleksandr Kravchuk
> >> :
> >>> Sure, will do.
> >>>
> > Also, one patch is changed in a way that makes it lose significant
> amount
> > of information (it's an amalgamation of three patches)
> >>> Could you please clarify which one do you mean? Thank you.
> >>>
> >>>
> >>> On 9/13/18 9:46 PM, Alexander Kanavin wrote:
> Please explain the changes to patches (not as a reply to me, but in
> the commit message itself).
> If they are deleted because upstream already has them, it should be
> mentioned explicitly.
>
> Also, one patch is changed in a way that makes it lose significant
> amount of information
> (it's an amalgamation of three patches). Perhaps we should just split
> it in three?
>
> Alex
>
> 2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
> :
> > Signed-off-by: Oleksandr Kravchuk
> > ---
> > meta/recipes-connectivity/connman/connman.inc | 2 +-
> > ...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446
> --
> > ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
> > ...refixlen-to-iproute_default_function.patch | 63 ---
> > ...eep-track-of-addr-in-fw_snat-session.patch | 112 -
> > ...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
> > ...PIs-for-creating-and-deleting-subnet.patch | 68 ---
> > ...net-route-creation-and-deletion-APIs.patch | 77 ---
> > .../connman/connman_1.35.bb | 22 -
> > .../connman/connman_1.36.bb | 17 +
> > 10 files changed, 212 insertions(+), 705 deletions(-)
> > rename meta/recipes-connectivity/connman/connman/{includes.patch
> =>
> > 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0001-
> giognutls-Fix-a-crash-using-wispr-over-TLS.patch
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0001-inet-Add-
> prefixlen-to-iproute_default_function.patch
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0001-session-
> Keep-track-of-addr-in-fw_snat-session.patch
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0002-inet-
> Implement-subnet-route-creation-deletion-in-ipr.patch
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0003-inet-
> Implement-APIs-for-creating-and-deleting-subnet.patch
> > delete mode 100644
> > meta/recipes-connectivity/connman/connman/0004-session-
> Use-subnet-route-creation-and-deletion-APIs.patch
> > delete mode 100644 meta/recipes-connectivity/connman/
> connman_1.35.bb
> > create mode 100644 meta/recipes-connectivity/connman/
> connman_1.36.bb
> >
> > diff --git a/meta/recipes-connectivity/connman/connman.inc
> > b/meta/recipes-connectivity/connman/connman.inc
> > index 2b03f9cb06..0ba375137d 100644
> > ---
Re: [OE-core] [PATCH] connman: update to 1.36
Well, no. The patch file contains three different patches, all fixing
different things, and this information about the second and third one
for instance has vanished:
-From b8b7878e6cb2a1ed4fcfa256f7e232511a40e3d9 Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Tue, 9 Aug 2016 15:37:50 +0100
-Subject: [PATCH 2/3] Check for in6_pktinfo.ipi6_addr explicitly
-
-Instead of assuming that just glibc has this structure, check for it at
-configure as musl also has it.
-
-Based on work by Khem Raj .
-From c0726e432fa0274a2b9c70179b03df6720972816 Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Tue, 9 Aug 2016 15:19:23 +0100
-Subject: [PATCH 3/3] Rationalise includes
-
-gweb/gresolv.c uses snprintf() and isspace() so it should include stdio.h and
-ctype.h.
-
-tools/dnsproxy-test uses functions from stdio.h.
-
-musl warns when sys/ headers are included when the non-sys form should be used,
-so switch sys/errno.h and so on to errno.h.
-
-musl also causes redefinition errors when pieces of the networking headers are
-included, so remove the redundant includes.
-
-Based on work by Khem Raj .
Alex
2018-09-19 0:24 GMT+02:00 Oleksandr Kravchuk
:
> Sorry for the delay. This patch hasn't really been changed much: it was
> simply rebased, renamed and converted into git format. Would it be
> enough to keep it the way it is and describe the changes in the commit
> message?
>
> On 13/09/2018 23:38, Alexander Kanavin wrote:
>> This one:
>> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
>> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
>>
>> I think you should make two commits: one that splits this patch in
>> three, and another which actually does the version update.
>>
>> Alex
>>
>> 2018-09-13 23:08 GMT+02:00 Oleksandr Kravchuk
>> :
>>> Sure, will do.
>>>
> Also, one patch is changed in a way that makes it lose significant amount
> of information (it's an amalgamation of three patches)
>>> Could you please clarify which one do you mean? Thank you.
>>>
>>>
>>> On 9/13/18 9:46 PM, Alexander Kanavin wrote:
Please explain the changes to patches (not as a reply to me, but in
the commit message itself).
If they are deleted because upstream already has them, it should be
mentioned explicitly.
Also, one patch is changed in a way that makes it lose significant
amount of information
(it's an amalgamation of three patches). Perhaps we should just split
it in three?
Alex
2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
:
> Signed-off-by: Oleksandr Kravchuk
> ---
> meta/recipes-connectivity/connman/connman.inc | 2 +-
> ...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
> ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
> ...refixlen-to-iproute_default_function.patch | 63 ---
> ...eep-track-of-addr-in-fw_snat-session.patch | 112 -
> ...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
> ...PIs-for-creating-and-deleting-subnet.patch | 68 ---
> ...net-route-creation-and-deletion-APIs.patch | 77 ---
> .../connman/connman_1.35.bb | 22 -
> .../connman/connman_1.36.bb | 17 +
> 10 files changed, 212 insertions(+), 705 deletions(-)
> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
> delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
> create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc
> b/meta/recipes-connectivity/connman/connman.inc
> index 2b03f9cb06..0ba375137d 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
>
> FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
> ${libdir}/lib*.so.* \
> ${libdir}/connman/plugins \
> -${sysconfdir} ${sharedstatedir} ${localstatedir} \
> +${sysconfdir}
Re: [OE-core] [PATCH] connman: update to 1.36
Sorry for the delay. This patch hasn't really been changed much: it was
simply rebased, renamed and converted into git format. Would it be
enough to keep it the way it is and describe the changes in the commit
message?
On 13/09/2018 23:38, Alexander Kanavin wrote:
> This one:
> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
>
> I think you should make two commits: one that splits this patch in
> three, and another which actually does the version update.
>
> Alex
>
> 2018-09-13 23:08 GMT+02:00 Oleksandr Kravchuk
> :
>> Sure, will do.
>>
Also, one patch is changed in a way that makes it lose significant amount
of information (it's an amalgamation of three patches)
>> Could you please clarify which one do you mean? Thank you.
>>
>>
>> On 9/13/18 9:46 PM, Alexander Kanavin wrote:
>>> Please explain the changes to patches (not as a reply to me, but in
>>> the commit message itself).
>>> If they are deleted because upstream already has them, it should be
>>> mentioned explicitly.
>>>
>>> Also, one patch is changed in a way that makes it lose significant
>>> amount of information
>>> (it's an amalgamation of three patches). Perhaps we should just split
>>> it in three?
>>>
>>> Alex
>>>
>>> 2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
>>> :
Signed-off-by: Oleksandr Kravchuk
---
meta/recipes-connectivity/connman/connman.inc | 2 +-
...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
...refixlen-to-iproute_default_function.patch | 63 ---
...eep-track-of-addr-in-fw_snat-session.patch | 112 -
...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
...PIs-for-creating-and-deleting-subnet.patch | 68 ---
...net-route-creation-and-deletion-APIs.patch | 77 ---
.../connman/connman_1.35.bb | 22 -
.../connman/connman_1.36.bb | 17 +
10 files changed, 212 insertions(+), 705 deletions(-)
rename meta/recipes-connectivity/connman/connman/{includes.patch =>
0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index 2b03f9cb06..0ba375137d 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*.so.* \
${libdir}/connman/plugins \
-${sysconfdir} ${sharedstatedir} ${localstatedir} \
+${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir}
\
${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so*
${datadir}/${PN} \
${datadir}/dbus-1/system-services/* \
${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
diff --git a/meta/recipes-connectivity/connman/connman/includes.patch
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
similarity index 68%
rename from meta/recipes-connectivity/connman/connman/includes.patch
rename to
meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
index 55cb187931..e826bf002d 100644
--- a/meta/recipes-connectivity/connman/connman/includes.patch
+++
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
@@ -1,36 +1,40 @@
-Fix various issues which cause problems under musl.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton
-
-From 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001
+From 56fc228eebadc546d969a7073caf14d465ef3e5a Mon Sep 17 00:00:00 2001
From: Ross Burton
-Date: Tue, 9 Aug 2016 16:22:36 +0100
-Subject: [PATCH
Re: [OE-core] [PATCH] connman: update to 1.36
This one:
rename meta/recipes-connectivity/connman/connman/{includes.patch =>
0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
I think you should make two commits: one that splits this patch in
three, and another which actually does the version update.
Alex
2018-09-13 23:08 GMT+02:00 Oleksandr Kravchuk
:
> Sure, will do.
>
>>> Also, one patch is changed in a way that makes it lose significant amount
>>> of information (it's an amalgamation of three patches)
>
> Could you please clarify which one do you mean? Thank you.
>
>
> On 9/13/18 9:46 PM, Alexander Kanavin wrote:
>>
>> Please explain the changes to patches (not as a reply to me, but in
>> the commit message itself).
>> If they are deleted because upstream already has them, it should be
>> mentioned explicitly.
>>
>> Also, one patch is changed in a way that makes it lose significant
>> amount of information
>> (it's an amalgamation of three patches). Perhaps we should just split
>> it in three?
>>
>> Alex
>>
>> 2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
>> :
>>>
>>> Signed-off-by: Oleksandr Kravchuk
>>> ---
>>> meta/recipes-connectivity/connman/connman.inc | 2 +-
>>> ...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
>>> ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
>>> ...refixlen-to-iproute_default_function.patch | 63 ---
>>> ...eep-track-of-addr-in-fw_snat-session.patch | 112 -
>>> ...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
>>> ...PIs-for-creating-and-deleting-subnet.patch | 68 ---
>>> ...net-route-creation-and-deletion-APIs.patch | 77 ---
>>> .../connman/connman_1.35.bb | 22 -
>>> .../connman/connman_1.36.bb | 17 +
>>> 10 files changed, 212 insertions(+), 705 deletions(-)
>>> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
>>> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
>>> delete mode 100644
>>> meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
>>> delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
>>> create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
>>>
>>> diff --git a/meta/recipes-connectivity/connman/connman.inc
>>> b/meta/recipes-connectivity/connman/connman.inc
>>> index 2b03f9cb06..0ba375137d 100644
>>> --- a/meta/recipes-connectivity/connman/connman.inc
>>> +++ b/meta/recipes-connectivity/connman/connman.inc
>>> @@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
>>>
>>> FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
>>> ${libdir}/lib*.so.* \
>>> ${libdir}/connman/plugins \
>>> -${sysconfdir} ${sharedstatedir} ${localstatedir} \
>>> +${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir}
>>> \
>>> ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so*
>>> ${datadir}/${PN} \
>>> ${datadir}/dbus-1/system-services/* \
>>> ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
>>> diff --git a/meta/recipes-connectivity/connman/connman/includes.patch
>>> b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
>>> similarity index 68%
>>> rename from meta/recipes-connectivity/connman/connman/includes.patch
>>> rename to
>>> meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
>>> index 55cb187931..e826bf002d 100644
>>> --- a/meta/recipes-connectivity/connman/connman/includes.patch
>>> +++
>>> b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
>>> @@ -1,36 +1,40 @@
>>> -Fix various issues which cause problems under musl.
>>> -
>>> -Upstream-Status: Submitted
>>> -Signed-off-by: Ross Burton
>>> -
>>> -From 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001
>>> +From 56fc228eebadc546d969a7073caf14d465ef3e5a Mon Sep 17 00:00:00 2001
>>> From: Ross Burton
>>> -Date: Tue, 9 Aug 2016 16:22:36 +0100
>>> -Subject: [PATCH 1/3] Use AC_USE_SYSTEM_EXTENSIONS
>>> +Date: Thu, 13 Sep 2018 19:57:54 +0200
>>> +Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS
>>>
>>> -Instead of using #define _GNU_SOURCE in some source files which causes
>>> problems
>>> -when building with musl as more files need the define, simply use
>>> -AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
Re: [OE-core] [PATCH] connman: update to 1.36
Sure, will do.
>> Also, one patch is changed in a way that makes it lose significant
amount of information (it's an amalgamation of three patches)
Could you please clarify which one do you mean? Thank you.
On 9/13/18 9:46 PM, Alexander Kanavin wrote:
Please explain the changes to patches (not as a reply to me, but in
the commit message itself).
If they are deleted because upstream already has them, it should be
mentioned explicitly.
Also, one patch is changed in a way that makes it lose significant
amount of information
(it's an amalgamation of three patches). Perhaps we should just split
it in three?
Alex
2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
:
Signed-off-by: Oleksandr Kravchuk
---
meta/recipes-connectivity/connman/connman.inc | 2 +-
...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
...refixlen-to-iproute_default_function.patch | 63 ---
...eep-track-of-addr-in-fw_snat-session.patch | 112 -
...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
...PIs-for-creating-and-deleting-subnet.patch | 68 ---
...net-route-creation-and-deletion-APIs.patch | 77 ---
.../connman/connman_1.35.bb | 22 -
.../connman/connman_1.36.bb | 17 +
10 files changed, 212 insertions(+), 705 deletions(-)
rename meta/recipes-connectivity/connman/connman/{includes.patch =>
0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index 2b03f9cb06..0ba375137d 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${libdir}/connman/plugins \
-${sysconfdir} ${sharedstatedir} ${localstatedir} \
+${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir} \
${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so*
${datadir}/${PN} \
${datadir}/dbus-1/system-services/* \
${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
diff --git a/meta/recipes-connectivity/connman/connman/includes.patch
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
similarity index 68%
rename from meta/recipes-connectivity/connman/connman/includes.patch
rename to
meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
index 55cb187931..e826bf002d 100644
--- a/meta/recipes-connectivity/connman/connman/includes.patch
+++
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
@@ -1,36 +1,40 @@
-Fix various issues which cause problems under musl.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton
-
-From 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001
+From 56fc228eebadc546d969a7073caf14d465ef3e5a Mon Sep 17 00:00:00 2001
From: Ross Burton
-Date: Tue, 9 Aug 2016 16:22:36 +0100
-Subject: [PATCH 1/3] Use AC_USE_SYSTEM_EXTENSIONS
+Date: Thu, 13 Sep 2018 19:57:54 +0200
+Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS
-Instead of using #define _GNU_SOURCE in some source files which causes problems
-when building with musl as more files need the define, simply use
-AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
+Instead of using #define _GNU_SOURCE in some source files which causes
+problems when building with musl as more files need the define, simply
+use AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
---
- configure.ac | 1 +
- gdhcp/client.c | 1 -
- plugins/tist.c | 1 -
- src/backtrace.c| 1 -
- src/inet.c | 1 -
- src/log.c | 1 -
- src/ntp.c | 1 -
- src/resolver.c | 1 -
- src/rfkill.c | 1 -
- src/stats.c| 1 -
- src/timezone.c | 1 -
- tools/stats-tool.c | 1 -
- tools/tap-test.c | 1 -
- tools/wispr.c | 1 -
- vpn/plugins/vpn.c | 1 -
- 15 files changed, 1
Re: [OE-core] [PATCH] connman: update to 1.36
Please explain the changes to patches (not as a reply to me, but in
the commit message itself).
If they are deleted because upstream already has them, it should be
mentioned explicitly.
Also, one patch is changed in a way that makes it lose significant
amount of information
(it's an amalgamation of three patches). Perhaps we should just split
it in three?
Alex
2018-09-13 21:04 GMT+02:00 Oleksandr Kravchuk
:
> Signed-off-by: Oleksandr Kravchuk
> ---
> meta/recipes-connectivity/connman/connman.inc | 2 +-
> ...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
> ...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
> ...refixlen-to-iproute_default_function.patch | 63 ---
> ...eep-track-of-addr-in-fw_snat-session.patch | 112 -
> ...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
> ...PIs-for-creating-and-deleting-subnet.patch | 68 ---
> ...net-route-creation-and-deletion-APIs.patch | 77 ---
> .../connman/connman_1.35.bb | 22 -
> .../connman/connman_1.36.bb | 17 +
> 10 files changed, 212 insertions(+), 705 deletions(-)
> rename meta/recipes-connectivity/connman/connman/{includes.patch =>
> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
> delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
> create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc
> b/meta/recipes-connectivity/connman/connman.inc
> index 2b03f9cb06..0ba375137d 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
>
> FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
> ${libdir}/connman/plugins \
> -${sysconfdir} ${sharedstatedir} ${localstatedir} \
> +${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir} \
> ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so*
> ${datadir}/${PN} \
> ${datadir}/dbus-1/system-services/* \
> ${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
> diff --git a/meta/recipes-connectivity/connman/connman/includes.patch
> b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
> similarity index 68%
> rename from meta/recipes-connectivity/connman/connman/includes.patch
> rename to
> meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
> index 55cb187931..e826bf002d 100644
> --- a/meta/recipes-connectivity/connman/connman/includes.patch
> +++
> b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
> @@ -1,36 +1,40 @@
> -Fix various issues which cause problems under musl.
> -
> -Upstream-Status: Submitted
> -Signed-off-by: Ross Burton
> -
> -From 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001
> +From 56fc228eebadc546d969a7073caf14d465ef3e5a Mon Sep 17 00:00:00 2001
> From: Ross Burton
> -Date: Tue, 9 Aug 2016 16:22:36 +0100
> -Subject: [PATCH 1/3] Use AC_USE_SYSTEM_EXTENSIONS
> +Date: Thu, 13 Sep 2018 19:57:54 +0200
> +Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS
>
> -Instead of using #define _GNU_SOURCE in some source files which causes
> problems
> -when building with musl as more files need the define, simply use
> -AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
> +Instead of using #define _GNU_SOURCE in some source files which causes
> +problems when building with musl as more files need the define, simply
> +use AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
> ---
> - configure.ac | 1 +
> - gdhcp/client.c | 1 -
> - plugins/tist.c | 1 -
> - src/backtrace.c| 1 -
> - src/inet.c | 1 -
> - src/log.c | 1 -
> - src/ntp.c | 1 -
> - src/resolver.c | 1 -
> - src/rfkill.c | 1 -
> - src/stats.c| 1 -
> - src/timezone.c | 1 -
> - tools/stats-tool.c | 1 -
> - tools/tap-test.c | 1 -
> - tools/wispr.c | 1 -
> - vpn/plugins/vpn.c | 1 -
> - 15 files changed, 1 insertion(+), 14 deletions(-)
> + configure.ac | 3 +++
> + gdhcp/client.c
[OE-core] [PATCH] connman: update to 1.36
Signed-off-by: Oleksandr Kravchuk
---
meta/recipes-connectivity/connman/connman.inc | 2 +-
...> 0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} | 446 --
...tls-Fix-a-crash-using-wispr-over-TLS.patch | 41 --
...refixlen-to-iproute_default_function.patch | 63 ---
...eep-track-of-addr-in-fw_snat-session.patch | 112 -
...ubnet-route-creation-deletion-in-ipr.patch | 69 ---
...PIs-for-creating-and-deleting-subnet.patch | 68 ---
...net-route-creation-and-deletion-APIs.patch | 77 ---
.../connman/connman_1.35.bb | 22 -
.../connman/connman_1.36.bb | 17 +
10 files changed, 212 insertions(+), 705 deletions(-)
rename meta/recipes-connectivity/connman/connman/{includes.patch =>
0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch} (68%)
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
delete mode 100644
meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
delete mode 100644 meta/recipes-connectivity/connman/connman_1.35.bb
create mode 100644 meta/recipes-connectivity/connman/connman_1.36.bb
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index 2b03f9cb06..0ba375137d 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -156,7 +156,7 @@ RDEPENDS_${PN}-client ="${PN}"
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${libdir}/connman/plugins \
-${sysconfdir} ${sharedstatedir} ${localstatedir} \
+${sysconfdir} ${sharedstatedir} ${localstatedir} ${datadir} \
${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so*
${datadir}/${PN} \
${datadir}/dbus-1/system-services/* \
${sysconfdir}/tmpfiles.d/connman_resolvconf.conf"
diff --git a/meta/recipes-connectivity/connman/connman/includes.patch
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
similarity index 68%
rename from meta/recipes-connectivity/connman/connman/includes.patch
rename to
meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
index 55cb187931..e826bf002d 100644
--- a/meta/recipes-connectivity/connman/connman/includes.patch
+++
b/meta/recipes-connectivity/connman/connman/0001-Use-AC_USE_SYSTEM_EXTENSIONS.patch
@@ -1,36 +1,40 @@
-Fix various issues which cause problems under musl.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton
-
-From 630516bcc0233b047f65665c003201ba6e77453d Mon Sep 17 00:00:00 2001
+From 56fc228eebadc546d969a7073caf14d465ef3e5a Mon Sep 17 00:00:00 2001
From: Ross Burton
-Date: Tue, 9 Aug 2016 16:22:36 +0100
-Subject: [PATCH 1/3] Use AC_USE_SYSTEM_EXTENSIONS
+Date: Thu, 13 Sep 2018 19:57:54 +0200
+Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS
-Instead of using #define _GNU_SOURCE in some source files which causes problems
-when building with musl as more files need the define, simply use
-AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
+Instead of using #define _GNU_SOURCE in some source files which causes
+problems when building with musl as more files need the define, simply
+use AC_USE_SYSTEM_EXTENSIONS in configure.ac to get it defined globally.
---
- configure.ac | 1 +
- gdhcp/client.c | 1 -
- plugins/tist.c | 1 -
- src/backtrace.c| 1 -
- src/inet.c | 1 -
- src/log.c | 1 -
- src/ntp.c | 1 -
- src/resolver.c | 1 -
- src/rfkill.c | 1 -
- src/stats.c| 1 -
- src/timezone.c | 1 -
- tools/stats-tool.c | 1 -
- tools/tap-test.c | 1 -
- tools/wispr.c | 1 -
- vpn/plugins/vpn.c | 1 -
- 15 files changed, 1 insertion(+), 14 deletions(-)
+ configure.ac | 3 +++
+ gdhcp/client.c | 1 -
+ gdhcp/common.h | 5 +++--
+ gweb/gresolv.c | 2 ++
+ plugins/tist.c | 1 -
+ plugins/wifi.c | 3 +--
+ src/backtrace.c | 1 -
+ src/inet.c | 1 -
+ src/ippool.c | 1 -
+ src/iptables.c | 2 +-
+ src/log.c| 1 -
+ src/ntp.c| 1 -
+ src/resolver.c | 1 -
+ src/rfkill.c | 1 -
+ src/stats.c | 1 -
+ src/tethering.c | 2 --
+ src/timezone.c | 1 -
+ tools/dhcp-test.c
