[PATCH] libunique: fix installed-vs-shipped qa issue

[PATCH] libunique: fix installed-vs-shipped qa issue

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

libunique shows installed-vs-shipped QA issue if configure option
'--disable-introspection' is set by:
1) in gobject-introspection*.bbclass that the 'qemu-usermode' is not
   supported by bsp and then not set in MACHINE_FEATURES
or:
2) set in local.conf directly:
   EXTRA_OECONF_append_pn-libunique = " --disable-introspection"

Remove empty directory to fix the QA issue.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
index 49ed07ad9..a6475cef6 100644
--- a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
+++ b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
@@ -28,3 +28,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc
 
 REQUIRED_DISTRO_FEATURES = "x11"
+
+do_install_append () {
+    rmdir --ignore-fail-on-non-empty ${D}${datadir}
+}
-- 
2.19.0.rc2

Re: [meta-xfce][PATCH] libunique: fix installed-vs-shipped qa issue

[Kang Kai]

On 2018/11/5 下午1:59, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>


Oops. Forgot prefix [meta-xfce] in the title.

--Kai


>
> libunique shows installed-vs-shipped QA issue if configure option
> '--disable-introspection' is set by:
> 1) in gobject-introspection*.bbclass that the 'qemu-usermode' is not
>     supported by bsp and then not set in MACHINE_FEATURES
> or:
> 2) set in local.conf directly:
>     EXTRA_OECONF_append_pn-libunique = " --disable-introspection"
>
> Remove empty directory to fix the QA issue.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>   meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> index 49ed07ad9..a6475cef6 100644
> --- a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> +++ b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> @@ -28,3 +28,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
>   inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc
>   
>   REQUIRED_DISTRO_FEATURES = "x11"
> +
> +do_install_append () {
> +    rmdir --ignore-fail-on-non-empty ${D}${datadir}
> +}


-- 
Regards,
Neil | Kai Kang

Re: [meta-xfce][PATCH] libunique: fix installed-vs-shipped qa issue

[Andreas Müller]

On Mon, Nov 5, 2018 at 7:58 AM Kang Kai <Kai.Kang@windriver.com> wrote:
>
> On 2018/11/5 下午1:59, kai.kang@windriver.com wrote:
> > From: Kai Kang <kai.kang@windriver.com>
>
>
> Oops. Forgot prefix [meta-xfce] in the title.
>
> --Kai
>
>
> >
> > libunique shows installed-vs-shipped QA issue if configure option
> > '--disable-introspection' is set by:
> > 1) in gobject-introspection*.bbclass that the 'qemu-usermode' is not
> >     supported by bsp and then not set in MACHINE_FEATURES
> > or:
> > 2) set in local.conf directly:
> >     EXTRA_OECONF_append_pn-libunique = " --disable-introspection"
> >
> > Remove empty directory to fix the QA issue.
> >
> > Signed-off-by: Kai Kang <kai.kang@windriver.com>
> > ---
> >   meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb | 4 ++++
> >   1 file changed, 4 insertions(+)
> >
> > diff --git a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> > index 49ed07ad9..a6475cef6 100644
> > --- a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> > +++ b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
> > @@ -28,3 +28,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
> >   inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc
> >
> >   REQUIRED_DISTRO_FEATURES = "x11"
> > +
> > +do_install_append () {
> > +    rmdir --ignore-fail-on-non-empty ${D}${datadir}
> > +}
>
I think this breaks introspection - why not just pack Unique-1.0.gir?

Andreas

Re: [meta-xfce][PATCH] libunique: fix installed-vs-shipped qa issue

[Kang Kai]

On 2018/11/5 下午4:30, Andreas Müller wrote:
> On Mon, Nov 5, 2018 at 7:58 AM Kang Kai <Kai.Kang@windriver.com> wrote:
>> On 2018/11/5 下午1:59, kai.kang@windriver.com wrote:
>>> From: Kai Kang <kai.kang@windriver.com>
>>
>> Oops. Forgot prefix [meta-xfce] in the title.
>>
>> --Kai
>>
>>
>>> libunique shows installed-vs-shipped QA issue if configure option
>>> '--disable-introspection' is set by:
>>> 1) in gobject-introspection*.bbclass that the 'qemu-usermode' is not
>>>      supported by bsp and then not set in MACHINE_FEATURES
>>> or:
>>> 2) set in local.conf directly:
>>>      EXTRA_OECONF_append_pn-libunique = " --disable-introspection"
>>>
>>> Remove empty directory to fix the QA issue.
>>>
>>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>>> ---
>>>    meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb | 4 ++++
>>>    1 file changed, 4 insertions(+)
>>>
>>> diff --git a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
>>> index 49ed07ad9..a6475cef6 100644
>>> --- a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
>>> +++ b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
>>> @@ -28,3 +28,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
>>>    inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc
>>>
>>>    REQUIRED_DISTRO_FEATURES = "x11"
>>> +
>>> +do_install_append () {
>>> +    rmdir --ignore-fail-on-non-empty ${D}${datadir}
>>> +}
> I think this breaks introspection - why not just pack Unique-1.0.gir?


If configure option '--disable-introspection' is set rather than 
'--enable-introspection', no file Unique-1.0.gir is created and 
${D}${datadir} is empty.
Option '--ignore-fail-on-non-empty' of rmdir is to make sure not affect 
introspection.

Regards,
Kai

>
> Andreas
>

-- 
Regards,
Neil | Kai Kang

Re: [meta-xfce][PATCH] libunique: fix installed-vs-shipped qa issue

[Andreas Müller]

> > I think this breaks introspection - why not just pack Unique-1.0.gir?
>
>
> If configure option '--disable-introspection' is set rather than
> '--enable-introspection', no file Unique-1.0.gir is created and
> ${D}${datadir} is empty.
> Option '--ignore-fail-on-non-empty' of rmdir is to make sure not affect
> introspection.
>
Ok - thanks.

Andreas