Patchwork [05/12] libnl-3: Upgrade to 3.2.14

login
register
mail settings
Submitter Morten Svendsen
Date Nov. 21, 2012, 10:28 p.m.
Message ID <e2afb4d762c5bc1f78cbf1535b0dd6be303ad658.1353493728.git.Morten.ThunbergSvendsen@prevas.dk>
Download mbox | patch
Permalink /patch/200870/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Morten Svendsen - Nov. 21, 2012, 10:28 p.m.
3.2.7 had problem, at least on imx53, with segmentation fault in the libnl
"put_opts()" function.
---
 recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch |    0
 recipes/libnl/libnl.inc                                       |    2 ++
 recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe}             |    0
 recipes/libnl/libnl_3.2.14.oe.sig                             |    1 +
 4 files changed, 3 insertions(+)
 rename recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch (100%)
 rename recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe} (100%)
 create mode 100644 recipes/libnl/libnl_3.2.14.oe.sig
Esben Haabendal - Dec. 14, 2012, 6:15 p.m.
Morten Thunberg Svendsen <Morten.ThunbergSvendsen@prevas.dk> writes:

> 3.2.7 had problem, at least on imx53, with segmentation fault in the libnl
> "put_opts()" function.
> ---
>  recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch |    0
>  recipes/libnl/libnl.inc                                       |    2 ++
>  recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe}             |    0
>  recipes/libnl/libnl_3.2.14.oe.sig                             |    1 +
>  4 files changed, 3 insertions(+)
>  rename recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch (100%)
>  rename recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe} (100%)
>  create mode 100644 recipes/libnl/libnl_3.2.14.oe.sig
>
> diff --git a/recipes/libnl/libnl-3.2.7/fix-pc-file.patch b/recipes/libnl/libnl-3.2.14/fix-pc-file.patch
> similarity index 100%
> rename from recipes/libnl/libnl-3.2.7/fix-pc-file.patch
> rename to recipes/libnl/libnl-3.2.14/fix-pc-file.patch
> diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc
> index 61268bc..5c287ab 100644
> --- a/recipes/libnl/libnl.inc
> +++ b/recipes/libnl/libnl.inc
> @@ -14,8 +14,10 @@ inherit auto-package-libs
>  AUTO_PACKAGE_LIBS = "nl-3 nl-route-3 nl-nf-3 nl-genl-3 nl-cli-3"
>  AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:,.0 ${sharedlibdir}:lib:,.0:"
>  AUTO_PACKAGE_LIBS_PCPREFIX = "lib"
> +AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
>  RDEPENDS_${PN}-libnl-nf-3 += "libnl-3 libnl-route-3"
>  RDEPENDS_${PN}-libnl-cli-3 += "libnl-3 libnl-route-3 libnl-genl-3 libnl-nf-3"
> +FILES_${PN}-libnl-route-3 += "${sysconfdir}/libnl/"

Could you split this up in a seperate commit, and thus a short
description of this change?  Is it specific to the new version, or is it
a valid fix for 3.2.7 also?

>  inherit auto-package-utils
>  AUTO_PACKAGE_UTILS = "\
> diff --git a/recipes/libnl/libnl_3.2.7.oe b/recipes/libnl/libnl_3.2.14.oe
> similarity index 100%
> rename from recipes/libnl/libnl_3.2.7.oe
> rename to recipes/libnl/libnl_3.2.14.oe
> diff --git a/recipes/libnl/libnl_3.2.14.oe.sig b/recipes/libnl/libnl_3.2.14.oe.sig
> new file mode 100644
> index 0000000..e0c18a4
> --- /dev/null
> +++ b/recipes/libnl/libnl_3.2.14.oe.sig
> @@ -0,0 +1 @@
> +532d2ad037ceef02eaa56c2c623b8844fa4a9929  libnl-3.2.14.tar.gz

Do you have any specific need/requirement for 3.2.14, or is it okay to
go to 3.2.16?

/Esben
Morten Svendsen - March 4, 2013, 1:54 p.m.
On 14-12-2012 19:15, Esben Haabendal wrote:
> Morten Thunberg Svendsen <Morten.ThunbergSvendsen@prevas.dk> writes:
>
>> 3.2.7 had problem, at least on imx53, with segmentation fault in the libnl
>> "put_opts()" function.
>> ---
>>   recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch |    0
>>   recipes/libnl/libnl.inc                                       |    2 ++
>>   recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe}             |    0
>>   recipes/libnl/libnl_3.2.14.oe.sig                             |    1 +
>>   4 files changed, 3 insertions(+)
>>   rename recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch (100%)
>>   rename recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe} (100%)
>>   create mode 100644 recipes/libnl/libnl_3.2.14.oe.sig
>>
>> diff --git a/recipes/libnl/libnl-3.2.7/fix-pc-file.patch b/recipes/libnl/libnl-3.2.14/fix-pc-file.patch
>> similarity index 100%
>> rename from recipes/libnl/libnl-3.2.7/fix-pc-file.patch
>> rename to recipes/libnl/libnl-3.2.14/fix-pc-file.patch
>> diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc
>> index 61268bc..5c287ab 100644
>> --- a/recipes/libnl/libnl.inc
>> +++ b/recipes/libnl/libnl.inc
>> @@ -14,8 +14,10 @@ inherit auto-package-libs
>>   AUTO_PACKAGE_LIBS = "nl-3 nl-route-3 nl-nf-3 nl-genl-3 nl-cli-3"
>>   AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:,.0 ${sharedlibdir}:lib:,.0:"
>>   AUTO_PACKAGE_LIBS_PCPREFIX = "lib"
>> +AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
>>   RDEPENDS_${PN}-libnl-nf-3 += "libnl-3 libnl-route-3"
>>   RDEPENDS_${PN}-libnl-cli-3 += "libnl-3 libnl-route-3 libnl-genl-3 libnl-nf-3"
>> +FILES_${PN}-libnl-route-3 += "${sysconfdir}/libnl/"
>
> Could you split this up in a seperate commit, and thus a short
> description of this change?  Is it specific to the new version, or is it
> a valid fix for 3.2.7 also?
>

Ok could you do the splitting?


commit message, libnl: Packages configuration files with the lib using 
them and fix DEPENDS.

Two configuration files in etc/libnl/, "pktloc" and "classid", both used 
by libnl-route-3, adding them to that package. Fix missing conf files 
when rdepending on fx. libnl-nf-3.

The libnl-dev contains dev files for all the different libs, so ensure 
they depend on the package.

>>   inherit auto-package-utils
>>   AUTO_PACKAGE_UTILS = "\
>> diff --git a/recipes/libnl/libnl_3.2.7.oe b/recipes/libnl/libnl_3.2.14.oe
>> similarity index 100%
>> rename from recipes/libnl/libnl_3.2.7.oe
>> rename to recipes/libnl/libnl_3.2.14.oe
>> diff --git a/recipes/libnl/libnl_3.2.14.oe.sig b/recipes/libnl/libnl_3.2.14.oe.sig
>> new file mode 100644
>> index 0000000..e0c18a4
>> --- /dev/null
>> +++ b/recipes/libnl/libnl_3.2.14.oe.sig
>> @@ -0,0 +1 @@
>> +532d2ad037ceef02eaa56c2c623b8844fa4a9929  libnl-3.2.14.tar.gz
>
> Do you have any specific need/requirement for 3.2.14, or is it okay to
> go to 3.2.16?

okay with 2.3.16

/Morten
Esben Haabendal - March 5, 2013, 7:54 a.m.
Morten Thunberg Svendsen <Morten.ThunbergSvendsen@prevas.dk> writes:

> On 14-12-2012 19:15, Esben Haabendal wrote:
>> Morten Thunberg Svendsen <Morten.ThunbergSvendsen@prevas.dk> writes:
>>
>>> 3.2.7 had problem, at least on imx53, with segmentation fault in the libnl
>>> "put_opts()" function.
>>> ---
>>>   recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch |    0
>>>   recipes/libnl/libnl.inc                                       |    2 ++
>>>   recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe}             |    0
>>>   recipes/libnl/libnl_3.2.14.oe.sig                             |    1 +
>>>   4 files changed, 3 insertions(+)
>>>   rename recipes/libnl/{libnl-3.2.7 => libnl-3.2.14}/fix-pc-file.patch (100%)
>>>   rename recipes/libnl/{libnl_3.2.7.oe => libnl_3.2.14.oe} (100%)
>>>   create mode 100644 recipes/libnl/libnl_3.2.14.oe.sig
>>>
>>> diff --git a/recipes/libnl/libnl-3.2.7/fix-pc-file.patch b/recipes/libnl/libnl-3.2.14/fix-pc-file.patch
>>> similarity index 100%
>>> rename from recipes/libnl/libnl-3.2.7/fix-pc-file.patch
>>> rename to recipes/libnl/libnl-3.2.14/fix-pc-file.patch
>>> diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc
>>> index 61268bc..5c287ab 100644
>>> --- a/recipes/libnl/libnl.inc
>>> +++ b/recipes/libnl/libnl.inc
>>> @@ -14,8 +14,10 @@ inherit auto-package-libs
>>>   AUTO_PACKAGE_LIBS = "nl-3 nl-route-3 nl-nf-3 nl-genl-3 nl-cli-3"
>>>   AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:,.0 ${sharedlibdir}:lib:,.0:"
>>>   AUTO_PACKAGE_LIBS_PCPREFIX = "lib"
>>> +AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
>>>   RDEPENDS_${PN}-libnl-nf-3 += "libnl-3 libnl-route-3"
>>>   RDEPENDS_${PN}-libnl-cli-3 += "libnl-3 libnl-route-3 libnl-genl-3 libnl-nf-3"
>>> +FILES_${PN}-libnl-route-3 += "${sysconfdir}/libnl/"
>>
>> Could you split this up in a seperate commit, and thus a short
>> description of this change?  Is it specific to the new version, or is it
>> a valid fix for 3.2.7 also?
>>
>
> Ok could you do the splitting?
>
>
> commit message, libnl: Packages configuration files with the lib using them
> and fix DEPENDS.
>
> Two configuration files in etc/libnl/, "pktloc" and "classid", both used by
> libnl-route-3, adding them to that package. Fix missing conf files when
> rdepending on fx. libnl-nf-3.
>
> The libnl-dev contains dev files for all the different libs, so ensure they
> depend on the package.

Yes, done and pushed to master.

I added version 3.2.21 (current stable) instead of 3.2.14.

/Esben

Patch

diff --git a/recipes/libnl/libnl-3.2.7/fix-pc-file.patch b/recipes/libnl/libnl-3.2.14/fix-pc-file.patch
similarity index 100%
rename from recipes/libnl/libnl-3.2.7/fix-pc-file.patch
rename to recipes/libnl/libnl-3.2.14/fix-pc-file.patch
diff --git a/recipes/libnl/libnl.inc b/recipes/libnl/libnl.inc
index 61268bc..5c287ab 100644
--- a/recipes/libnl/libnl.inc
+++ b/recipes/libnl/libnl.inc
@@ -14,8 +14,10 @@  inherit auto-package-libs
 AUTO_PACKAGE_LIBS = "nl-3 nl-route-3 nl-nf-3 nl-genl-3 nl-cli-3"
 AUTO_PACKAGE_LIBS_LIBDIR = "${libdir}:lib:,.0 ${sharedlibdir}:lib:,.0:"
 AUTO_PACKAGE_LIBS_PCPREFIX = "lib"
+AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}"
 RDEPENDS_${PN}-libnl-nf-3 += "libnl-3 libnl-route-3"
 RDEPENDS_${PN}-libnl-cli-3 += "libnl-3 libnl-route-3 libnl-genl-3 libnl-nf-3"
+FILES_${PN}-libnl-route-3 += "${sysconfdir}/libnl/"
 
 inherit auto-package-utils
 AUTO_PACKAGE_UTILS = "\
diff --git a/recipes/libnl/libnl_3.2.7.oe b/recipes/libnl/libnl_3.2.14.oe
similarity index 100%
rename from recipes/libnl/libnl_3.2.7.oe
rename to recipes/libnl/libnl_3.2.14.oe
diff --git a/recipes/libnl/libnl_3.2.14.oe.sig b/recipes/libnl/libnl_3.2.14.oe.sig
new file mode 100644
index 0000000..e0c18a4
--- /dev/null
+++ b/recipes/libnl/libnl_3.2.14.oe.sig
@@ -0,0 +1 @@ 
+532d2ad037ceef02eaa56c2c623b8844fa4a9929  libnl-3.2.14.tar.gz