[OE-core] [CONSOLIDATED PULL 20/27] libtool: Upgrade from 2.4 -> 2.4.2

[Koen Kooi]

Op 24 okt. 2011, om 16:10 heeft Richard Purdie het volgende geschreven:

> On Mon, 2011-10-24 at 15:37 +0200, Koen Kooi wrote:
>> Op 24 okt. 2011, om 15:34 heeft Richard Purdie het volgende geschreven:
>> 
>>> On Sun, 2011-10-23 at 11:26 -0700, Saul Wold wrote:
>>>> From: Khem Raj <raj.khem at gmail.com>
>>>> 
>>>> Adjust prefix.patch and delete resolve-sysroot.patch
>>>> since its already applied upstream
>>>> 
>>>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>>>> ---
>>>> .../libtool/{libtool.inc => libtool-2.4.2.inc}     |   26 +++++++++---
>>>> meta/recipes-devtools/libtool/libtool-2.4.inc      |   13 ------
>>>> ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} |    2 +-
>>>> ...btool-native_2.4.bb => libtool-native_2.4.2.bb} |    2 +-
>>>> ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} |    2 +-
>>>> meta/recipes-devtools/libtool/libtool/prefix.patch |   46 ++++++++++----------
>>>> .../libtool/libtool/resolve-sysroot.patch          |   42 ------------------
>>>> .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb}   |    2 +-
>>>> 8 files changed, 47 insertions(+), 88 deletions(-)
>>>> rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
>>>> delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
>>>> rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
>>>> rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
>>>> rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
>>>> delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
>>>> rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
>>>> 
>>>> diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
>>>> similarity index 57%
>>>> rename from meta/recipes-devtools/libtool/libtool.inc
>>>> rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc
>>>> index ef9095b..1f652ef 100644
>>>> --- a/meta/recipes-devtools/libtool/libtool.inc
>>>> +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
>>>> @@ -1,4 +1,3 @@
>>>> -SUMMARY = "Generic library support script"
>>> 
>>> Why drop the SUMMARY field?
>> 
>> What's the difference between SUMMARY and DESCRIPTION? And what happens if both are set?
> 
> SUMMARY is a one line 74? character summary of the package, DESCRIPTION
> is a multiple line stream of text containing a more verbose description.
> What happens to the data is package backend specific, I know RPM has
> uses for both. There was definitely discussion about this on the mailing
> list at the time, I'm not sure what if anything made it into the manuals
> but if its not there it should be added.


It seems to get OR'd:

meta/classes/package_deb.bbclass:       summary = bb.data.getVar('SUMMARY', localdata, True) or bb.data.getVar('DESCRIPTION', localdata, True) or "."
package_deb.bbclass:                     description = bb.data.getVar('DESCRIPTION', localdata, True) or "."

meta/classes/package_ipk.bbclass:         summary = bb.data.getVar('SUMMARY', localdata, True) or bb.data.getVar('DESCRIPTION', localdata, True) or "."
package_ipk.bbclass:                                    description = bb.data.getVar('DESCRIPTION', localdata, True) or "."

meta/classes/package_rpm.bbclass:       srcsummary = (bb.data.getVar('SUMMARY', d, True) or bb.data.getVar('DESCRIPTION', d, True) or ".")
package_rpm.bbclass:    srcdescription = bb.data.getVar('DESCRIPTION', d, True) or "."

regards,

Koen