Patchwork [meta-networking] inetutils: Remove empty usr/lib

login
register
mail settings
Submitter Khem Raj
Date Sept. 5, 2013, 9:02 p.m.
Message ID <1378414975-13587-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/57499/
State Accepted
Commit 87e52402949eb316229fc7ca68b0672d3b6333c4
Headers show

Comments

Khem Raj - Sept. 5, 2013, 9:02 p.m.
This directory is empty and is flagged by QA checker

ERROR: QA Issue: inetutils: Files/directories were installed but not
shipped
  /usr/lib

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 2 ++
 1 file changed, 2 insertions(+)
Martin Jansa - Sept. 5, 2013, 9:18 p.m.
On Thu, Sep 05, 2013 at 02:02:55PM -0700, Khem Raj wrote:
> This directory is empty and is flagged by QA checker
> 
> ERROR: QA Issue: inetutils: Files/directories were installed but not
> shipped
>   /usr/lib
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> index 7c7343e..e371ae5 100644
> --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> @@ -70,6 +70,8 @@ do_install_append () {
>      cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
>      cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
>      rm -rf ${D}${libexecdir}/
> +    # remove usr/lib if empty
> +    rmdir ${D}${libdir}

The comment suggests missing --ignore-fail-on-non-empty

>  }
>  
>  PACKAGES =+ "${PN}-ping ${PN}-ping6 ${PN}-hostname ${PN}-ifconfig \
> -- 
> 1.8.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj - Sept. 5, 2013, 10:32 p.m.
On Thu, Sep 5, 2013 at 2:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Sep 05, 2013 at 02:02:55PM -0700, Khem Raj wrote:
>> This directory is empty and is flagged by QA checker
>>
>> ERROR: QA Issue: inetutils: Files/directories were installed but not
>> shipped
>>   /usr/lib
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
>> index 7c7343e..e371ae5 100644
>> --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
>> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
>> @@ -70,6 +70,8 @@ do_install_append () {
>>      cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
>>      cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
>>      rm -rf ${D}${libexecdir}/
>> +    # remove usr/lib if empty
>> +    rmdir ${D}${libdir}
>
> The comment suggests missing --ignore-fail-on-non-empty

hmmm,I would add it when that happens and also then take opportunity
to make sure that they are packaged
into right packages, so far I have not found a case where its populated.

>
>>  }
>>
>>  PACKAGES =+ "${PN}-ping ${PN}-ping6 ${PN}-hostname ${PN}-ifconfig \
>> --
>> 1.8.4
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Joe MacDonald - Sept. 6, 2013, 1:41 p.m.
[Re: [oe] [meta-networking][PATCH] inetutils: Remove empty usr/lib] On 13.09.05 (Thu 15:32) Khem Raj wrote:

> On Thu, Sep 5, 2013 at 2:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Thu, Sep 05, 2013 at 02:02:55PM -0700, Khem Raj wrote:
> >> This directory is empty and is flagged by QA checker
> >>
> >> ERROR: QA Issue: inetutils: Files/directories were installed but not
> >> shipped
> >>   /usr/lib
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >>  meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> >> index 7c7343e..e371ae5 100644
> >> --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> >> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> >> @@ -70,6 +70,8 @@ do_install_append () {
> >>      cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
> >>      cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
> >>      rm -rf ${D}${libexecdir}/
> >> +    # remove usr/lib if empty
> >> +    rmdir ${D}${libdir}
> >
> > The comment suggests missing --ignore-fail-on-non-empty
> 
> hmmm,I would add it when that happens and also then take opportunity
> to make sure that they are packaged
> into right packages, so far I have not found a case where its populated.

Yep, I'm sold.

Merged.

-J.

> 
> >
> >>  }
> >>
> >>  PACKAGES =+ "${PN}-ping ${PN}-ping6 ${PN}-hostname ${PN}-ifconfig \
> >> --
> >> 1.8.4
> >>
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> >
> > _______________________________________________
> > 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

Patch

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
index 7c7343e..e371ae5 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -70,6 +70,8 @@  do_install_append () {
     cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
     cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
     rm -rf ${D}${libexecdir}/
+    # remove usr/lib if empty
+    rmdir ${D}${libdir}
 }
 
 PACKAGES =+ "${PN}-ping ${PN}-ping6 ${PN}-hostname ${PN}-ifconfig \