[meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Johannes Pointner]

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
---
 .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb} (63%)

diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
similarity index 63%
rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
index 3a6659815..edf836814 100644
--- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
+++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
@@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
 
 SRC_URI = "git://github.com/leethomason/tinyxml2.git"
 
-SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
+SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
 
 S = "${WORKDIR}/git"
 
 inherit cmake
 
+FILES_${PN} = " \
+    ${libdir}/lib*${SOLIBS} \
+    ${includedir}/* \
+    "
+
+FILES_${PN}-dev = " \
+    ${libdir}/lib*${SOLIBSDEV} \
+    ${libdir}/cmake/* \
+    ${libdir}/pkgconfig/* \
+    "
+
 BBCLASSEXTEND = "native"
-- 
2.13.2

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Andre McCurdy]

On Thu, Jul 6, 2017 at 2:30 AM, Johannes Pointner
<johannes.pointner@br-automation.com> wrote:
> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
> ---
>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb} (63%)
>
> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> similarity index 63%
> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> index 3a6659815..edf836814 100644
> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
>
>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
>
> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
>
>  S = "${WORKDIR}/git"
>
>  inherit cmake
>
> +FILES_${PN} = " \
> +    ${libdir}/lib*${SOLIBS} \
> +    ${includedir}/* \
> +    "
> +
> +FILES_${PN}-dev = " \
> +    ${libdir}/lib*${SOLIBSDEV} \
> +    ${libdir}/cmake/* \
> +    ${libdir}/pkgconfig/* \
> +    "
> +

These packaging changes look very odd. Can you explain why they're needed?

If the default packaging rules are not sufficient, the preferred
approach is to add additional patterns just to catch any unpackaged
files, not to completely replace the default rules.

>  BBCLASSEXTEND = "native"
> --
> 2.13.2
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Johannes Pointner]

2017-07-11 2:13 GMT+02:00 Andre McCurdy <armccurdy@gmail.com>:
> On Thu, Jul 6, 2017 at 2:30 AM, Johannes Pointner
> <johannes.pointner@br-automation.com> wrote:
>> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
>> ---
>>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13 ++++++++++++-
>>  1 file changed, 12 insertions(+), 1 deletion(-)
>>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb} (63%)
>>
>> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> similarity index 63%
>> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> index 3a6659815..edf836814 100644
>> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
>>
>>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
>>
>> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
>> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
>>
>>  S = "${WORKDIR}/git"
>>
>>  inherit cmake
>>
>> +FILES_${PN} = " \
>> +    ${libdir}/lib*${SOLIBS} \
>> +    ${includedir}/* \
>> +    "
>> +
>> +FILES_${PN}-dev = " \
>> +    ${libdir}/lib*${SOLIBSDEV} \
>> +    ${libdir}/cmake/* \
>> +    ${libdir}/pkgconfig/* \
>> +    "
>> +
>
> These packaging changes look very odd. Can you explain why they're needed?
>
> If the default packaging rules are not sufficient, the preferred
> approach is to add additional patterns just to catch any unpackaged
> files, not to completely replace the default rules.

without these I'll get the following error:

ERROR: libtinyxml2-5.0.1-r0 do_package: QA Issue: libtinyxml2:
Files/directories were installed but not shipped in any package:
  /usr/lib/cmake
  /usr/lib/cmake/tinyxml2
  /usr/lib/cmake/tinyxml2/tinyxml2Targets.cmake
  /usr/lib/cmake/tinyxml2/tinyxml2Targets-noconfig.cmake
  /usr/lib/cmake/tinyxml2/tinyxml2Config.cmake
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install.
libtinyxml2: 5 installed and not shipped files. [installed-vs-shipped]

Then I tried only to add the packaging rules for the dev package, but
then I ran into the next errors:
ERROR: libtinyxml2-5.0.1-r0 do_package: QA Issue: libtinyxml2:
Files/directories were installed but not shipped in any package:
  /usr/include
  /usr/include/tinyxml2.h
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install.
libtinyxml2: 2 installed and not shipped files. [installed-vs-shipped]

So I ended up with the above.
But I'm open for suggestions. Maybe there is a better solution I'm no seeing.

>
>>  BBCLASSEXTEND = "native"
>> --
>> 2.13.2
>>
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Maciej Borzęcki]

On Thu, Jul 6, 2017 at 11:30 AM, Johannes Pointner
<johannes.pointner@br-automation.com> wrote:
> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
> ---
>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb} (63%)
>
> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> similarity index 63%
> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> index 3a6659815..edf836814 100644
> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
>
>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
>
> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
>
>  S = "${WORKDIR}/git"
>
>  inherit cmake
>
> +FILES_${PN} = " \
> +    ${libdir}/lib*${SOLIBS} \
> +    ${includedir}/* \

pretty sure whatever is in ${includedir} it should be a part of -dev package.

> +    "
> +
> +FILES_${PN}-dev = " \
> +    ${libdir}/lib*${SOLIBSDEV} \
> +    ${libdir}/cmake/* \
> +    ${libdir}/pkgconfig/* \
> +    "
> +
>  BBCLASSEXTEND = "native"
> --
> 2.13.2
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel



-- 
Maciej Borzecki
RnDity

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Johannes Pointner]

2017-07-11 8:13 GMT+02:00 Maciej Borzęcki <maciej.borzecki@rndity.com>:
> On Thu, Jul 6, 2017 at 11:30 AM, Johannes Pointner
> <johannes.pointner@br-automation.com> wrote:
>> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
>> ---
>>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13 ++++++++++++-
>>  1 file changed, 12 insertions(+), 1 deletion(-)
>>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb} (63%)
>>
>> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> similarity index 63%
>> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> index 3a6659815..edf836814 100644
>> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
>>
>>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
>>
>> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
>> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
>>
>>  S = "${WORKDIR}/git"
>>
>>  inherit cmake
>>
>> +FILES_${PN} = " \
>> +    ${libdir}/lib*${SOLIBS} \
>> +    ${includedir}/* \
>
> pretty sure whatever is in ${includedir} it should be a part of -dev package.
You are right.
But this would still leave us with this rule:
FILES_${PN}-dev = " \
    ${includedir}/* \
    ${libdir}/lib*${SOLIBSDEV} \
    ${libdir}/cmake/* \
    ${libdir}/pkgconfig/* \
    "
Is this OK?
>
>> +    "
>> +
>> +FILES_${PN}-dev = " \
>> +    ${libdir}/lib*${SOLIBSDEV} \
>> +    ${libdir}/cmake/* \
>> +    ${libdir}/pkgconfig/* \
>> +    "
>> +
>>  BBCLASSEXTEND = "native"
>> --
>> 2.13.2
>>
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>
> --
> Maciej Borzecki
> RnDity
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Martin Jansa]

Just FILES_${PN}-dev += "${libdir}/cmake/" should be enough.

On Tue, Jul 11, 2017 at 8:24 AM, Johannes Pointner <h4nn35.work@gmail.com>
wrote:

> 2017-07-11 8:13 GMT+02:00 Maciej Borzęcki <maciej.borzecki@rndity.com>:
> > On Thu, Jul 6, 2017 at 11:30 AM, Johannes Pointner
> > <johannes.pointner@br-automation.com> wrote:
> >> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
> >> ---
> >>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13
> ++++++++++++-
> >>  1 file changed, 12 insertions(+), 1 deletion(-)
> >>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb =>
> libtinyxml2_5.0.1.bb} (63%)
> >>
> >> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> >> similarity index 63%
> >> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> >> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> >> index 3a6659815..edf836814 100644
> >> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
> >> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
> >> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM = "file://tinyxml2.cpp;endline=
> 22;md5=c19221dbd8a66ad3090462af4
> >>
> >>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
> >>
> >> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
> >> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
> >>
> >>  S = "${WORKDIR}/git"
> >>
> >>  inherit cmake
> >>
> >> +FILES_${PN} = " \
> >> +    ${libdir}/lib*${SOLIBS} \
> >> +    ${includedir}/* \
> >
> > pretty sure whatever is in ${includedir} it should be a part of -dev
> package.
> You are right.
> But this would still leave us with this rule:
> FILES_${PN}-dev = " \
>     ${includedir}/* \
>     ${libdir}/lib*${SOLIBSDEV} \
>     ${libdir}/cmake/* \
>     ${libdir}/pkgconfig/* \
>     "
> Is this OK?
> >
> >> +    "
> >> +
> >> +FILES_${PN}-dev = " \
> >> +    ${libdir}/lib*${SOLIBSDEV} \
> >> +    ${libdir}/cmake/* \
> >> +    ${libdir}/pkgconfig/* \
> >> +    "
> >> +
> >>  BBCLASSEXTEND = "native"
> >> --
> >> 2.13.2
> >>
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> >
> >
> > --
> > Maciej Borzecki
> > RnDity
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-oe][PATCH] libtinyxml2: upgrade to 5.0.1

[Johannes Pointner]

Thx Martin,
this does the trick.
I'll send a v2

2017-07-11 9:06 GMT+02:00 Martin Jansa <martin.jansa@gmail.com>:
> Just FILES_${PN}-dev += "${libdir}/cmake/" should be enough.
>
> On Tue, Jul 11, 2017 at 8:24 AM, Johannes Pointner <h4nn35.work@gmail.com>
> wrote:
>>
>> 2017-07-11 8:13 GMT+02:00 Maciej Borzęcki <maciej.borzecki@rndity.com>:
>> > On Thu, Jul 6, 2017 at 11:30 AM, Johannes Pointner
>> > <johannes.pointner@br-automation.com> wrote:
>> >> Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
>> >> ---
>> >>  .../{libtinyxml2_4.0.1.bb => libtinyxml2_5.0.1.bb}          | 13
>> >> ++++++++++++-
>> >>  1 file changed, 12 insertions(+), 1 deletion(-)
>> >>  rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_4.0.1.bb =>
>> >> libtinyxml2_5.0.1.bb} (63%)
>> >>
>> >> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> >> b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> >> similarity index 63%
>> >> rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> >> rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> >> index 3a6659815..edf836814 100644
>> >> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_4.0.1.bb
>> >> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
>> >> @@ -6,10 +6,21 @@ LIC_FILES_CHKSUM =
>> >> "file://tinyxml2.cpp;endline=22;md5=c19221dbd8a66ad3090462af4
>> >>
>> >>  SRC_URI = "git://github.com/leethomason/tinyxml2.git"
>> >>
>> >> -SRCREV = "74d44acb176f8510abf28ee0a70961eb26631988"
>> >> +SRCREV = "37bc3aca429f0164adf68c23444540b4a24b5778"
>> >>
>> >>  S = "${WORKDIR}/git"
>> >>
>> >>  inherit cmake
>> >>
>> >> +FILES_${PN} = " \
>> >> +    ${libdir}/lib*${SOLIBS} \
>> >> +    ${includedir}/* \
>> >
>> > pretty sure whatever is in ${includedir} it should be a part of -dev
>> > package.
>> You are right.
>> But this would still leave us with this rule:
>> FILES_${PN}-dev = " \
>>     ${includedir}/* \
>>     ${libdir}/lib*${SOLIBSDEV} \
>>     ${libdir}/cmake/* \
>>     ${libdir}/pkgconfig/* \
>>     "
>> Is this OK?
>> >
>> >> +    "
>> >> +
>> >> +FILES_${PN}-dev = " \
>> >> +    ${libdir}/lib*${SOLIBSDEV} \
>> >> +    ${libdir}/cmake/* \
>> >> +    ${libdir}/pkgconfig/* \
>> >> +    "
>> >> +
>> >>  BBCLASSEXTEND = "native"
>> >> --
>> >> 2.13.2
>> >>
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >
>> >
>> >
>> > --
>> > Maciej Borzecki
>> > RnDity
>> > --
>> > _______________________________________________
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>