Patchwork python-smartpm: Fix build error

login
register
mail settings
Submitter Saul Wold
Date Dec. 5, 2012, 4:13 p.m.
Message ID <1354724029-9230-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/40439/
State New
Headers show

Comments

Saul Wold - Dec. 5, 2012, 4:13 p.m.
datadir is normally /usr/share so we don't need to add /share to it.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Mark Hatle - Dec. 5, 2012, 5:42 p.m.
On 12/5/12 10:13 AM, Saul Wold wrote:
> datadir is normally /usr/share so we don't need to add /share to it.
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> index 254318c..3617fde 100644
> --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> @@ -44,7 +44,7 @@ inherit distutils
>
>   do_install_append() {
>      # Cleanup unused item...
> -   rmdir ${D}${datadir}/share
> +   rmdir ${D}${datadir}

I believe this is wrong.  There are things in /usr/share that we want from smart.

There are docs and locales and associated files...

I believe that was there because an errant "/usr/share/share" directory was 
generated and that caused problems.

>
>      # We don't support the following items
>      rm -rf ${D}${libdir}/python*/site-packages/smart/backends/slack
>
Martin Jansa - Dec. 5, 2012, 5:47 p.m.
On Wed, Dec 05, 2012 at 11:42:57AM -0600, Mark Hatle wrote:
> On 12/5/12 10:13 AM, Saul Wold wrote:
> > datadir is normally /usr/share so we don't need to add /share to it.
> >
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> >   meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> > index 254318c..3617fde 100644
> > --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> > +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
> > @@ -44,7 +44,7 @@ inherit distutils
> >
> >   do_install_append() {
> >      # Cleanup unused item...
> > -   rmdir ${D}${datadir}/share
> > +   rmdir ${D}${datadir}
> 
> I believe this is wrong.  There are things in /usr/share that we want from smart.
> 
> There are docs and locales and associated files...
> 
> I believe that was there because an errant "/usr/share/share" directory was 
> generated and that caused problems.

It really was in /usr/share/share and I've moved this fix to
distutils.bbclass in 
http://git.openembedded.org/openembedded-core/commit/?id=10457e343b27e63b35e0278b00e9c25106b0cc1b

So rmdir in python-smartpm should be dropped completely... I've fix for
that too, but still testing it together with other changes, but will
submit that pull-request today.

Cheers,

> 
> >
> >      # We don't support the following items
> >      rm -rf ${D}${libdir}/python*/site-packages/smart/backends/slack
> >
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Mark Hatle - Dec. 5, 2012, 5:54 p.m.
On 12/5/12 11:47 AM, Martin Jansa wrote:
> On Wed, Dec 05, 2012 at 11:42:57AM -0600, Mark Hatle wrote:
>> On 12/5/12 10:13 AM, Saul Wold wrote:
>>> datadir is normally /usr/share so we don't need to add /share to it.
>>>
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>> ---
>>>    meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>> index 254318c..3617fde 100644
>>> --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>> +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>> @@ -44,7 +44,7 @@ inherit distutils
>>>
>>>    do_install_append() {
>>>       # Cleanup unused item...
>>> -   rmdir ${D}${datadir}/share
>>> +   rmdir ${D}${datadir}
>>
>> I believe this is wrong.  There are things in /usr/share that we want from smart.
>>
>> There are docs and locales and associated files...
>>
>> I believe that was there because an errant "/usr/share/share" directory was
>> generated and that caused problems.
>
> It really was in /usr/share/share and I've moved this fix to
> distutils.bbclass in
> http://git.openembedded.org/openembedded-core/commit/?id=10457e343b27e63b35e0278b00e9c25106b0cc1b
>
> So rmdir in python-smartpm should be dropped completely... I've fix for
> that too, but still testing it together with other changes, but will
> submit that pull-request today.

Ahh, I see.. So yes, the rmdir is simply not needed then and can be removed.

--Mark

> Cheers,
>
>>
>>>
>>>       # We don't support the following items
>>>       rm -rf ${D}${libdir}/python*/site-packages/smart/backends/slack
>>>
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Saul Wold - Dec. 5, 2012, 5:57 p.m.
On 12/05/2012 09:54 AM, Mark Hatle wrote:
> On 12/5/12 11:47 AM, Martin Jansa wrote:
>> On Wed, Dec 05, 2012 at 11:42:57AM -0600, Mark Hatle wrote:
>>> On 12/5/12 10:13 AM, Saul Wold wrote:
>>>> datadir is normally /usr/share so we don't need to add /share to it.
>>>>
>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>>> ---
>>>>    meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>>> b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>>> index 254318c..3617fde 100644
>>>> --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>>> +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
>>>> @@ -44,7 +44,7 @@ inherit distutils
>>>>
>>>>    do_install_append() {
>>>>       # Cleanup unused item...
>>>> -   rmdir ${D}${datadir}/share
>>>> +   rmdir ${D}${datadir}
>>>
>>> I believe this is wrong.  There are things in /usr/share that we want
>>> from smart.
>>>
>>> There are docs and locales and associated files...
>>>
>>> I believe that was there because an errant "/usr/share/share"
>>> directory was
>>> generated and that caused problems.
>>
>> It really was in /usr/share/share and I've moved this fix to
>> distutils.bbclass in
>> http://git.openembedded.org/openembedded-core/commit/?id=10457e343b27e63b35e0278b00e9c25106b0cc1b
>>
>>
>> So rmdir in python-smartpm should be dropped completely... I've fix for
>> that too, but still testing it together with other changes, but will
>> submit that pull-request today.
>
> Ahh, I see.. So yes, the rmdir is simply not needed then and can be
> removed.
>
Ok, great, so I guess a patch from Martin shortly will resolved this, I 
want to get a clean build with MUT for RP to pull this stuff.

Thanks
	Sau!

> --Mark
>
>> Cheers,
>>
>>>
>>>>
>>>>       # We don't support the following items
>>>>       rm -rf ${D}${libdir}/python*/site-packages/smart/backends/slack
>>>>
>>>
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>

Patch

diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index 254318c..3617fde 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -44,7 +44,7 @@  inherit distutils
 
 do_install_append() {
    # Cleanup unused item...
-   rmdir ${D}${datadir}/share
+   rmdir ${D}${datadir}
 
    # We don't support the following items
    rm -rf ${D}${libdir}/python*/site-packages/smart/backends/slack