Patchwork [28/33] python-pycairo: fix installation path of __init__.py

login
register
mail settings
Submitter Saul Wold
Date April 22, 2011, 7:24 a.m.
Message ID <0daf49a24c9ff05b60377dad60234107009efbdb.1303453279.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/2671/
State New, archived
Headers show

Comments

Saul Wold - April 22, 2011, 7:24 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

This fixes Bug [YOCTO #477]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Khem Raj - April 22, 2011, 5:16 p.m.
On Fri, Apr 22, 2011 at 12:24 AM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> This fixes Bug [YOCTO #477]
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> index 7d73dc2..24b3ff2 100644
> --- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> +++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
>  # cairo >= 1.8.8
>  DEPENDS = "cairo"
> -PR = "ml0"
> +PR = "r1"

any reason not to use mlX
>
>  SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.gz"
>
> @@ -16,6 +16,12 @@ S = "${WORKDIR}/pycairo-${PV}"
>
>  inherit distutils pkgconfig
>
> +do_compile_prepend() {
> +#fix the installation path of __init__.py
> +#It was going in the sysroot instead of target install location
> +       sed -i -e "s#dsy.get_python_lib()#'${D}${PYTHON_SITEPACKAGES_DIR}'#" ${S}/setup.py
> +}
> +
>  do_install_append () {
>        install -d ${D}${includedir}
>        install -d ${D}${libdir}
> --
> 1.7.1
>
>
Koen Kooi - April 22, 2011, 5:25 p.m.
Op 22 apr 2011, om 19:16 heeft Khem Raj het volgende geschreven:

> On Fri, Apr 22, 2011 at 12:24 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>> 
>> This fixes Bug [YOCTO #477]
>> 
>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
>> ---
>>  .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
>>  1 files changed, 7 insertions(+), 1 deletions(-)
>> 
>> diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> index 7d73dc2..24b3ff2 100644
>> --- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> +++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
>>  # cairo >= 1.8.8
>>  DEPENDS = "cairo"
>> -PR = "ml0"
>> +PR = "r1"
> 
> any reason not to use mlX

Because rX is a standard and mlX isn't
Khem Raj - April 22, 2011, 5:27 p.m.
On Fri, Apr 22, 2011 at 10:25 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> Op 22 apr 2011, om 19:16 heeft Khem Raj het volgende geschreven:
>
>> On Fri, Apr 22, 2011 at 12:24 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>>>
>>> This fixes Bug [YOCTO #477]
>>>
>>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
>>> ---
>>>  .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
>>>  1 files changed, 7 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>>> index 7d73dc2..24b3ff2 100644
>>> --- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>>> +++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>>> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
>>>  LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
>>>  # cairo >= 1.8.8
>>>  DEPENDS = "cairo"
>>> -PR = "ml0"
>>> +PR = "r1"
>>
>> any reason not to use mlX
>
> Because rX is a standard and mlX isn't

why did we use ml to start with then ?
Graeme Gregory - April 22, 2011, 5:32 p.m.
On Fri, Apr 22, 2011 at 10:27:31AM -0700, Khem Raj wrote:
> On Fri, Apr 22, 2011 at 10:25 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >
> > Op 22 apr 2011, om 19:16 heeft Khem Raj het volgende geschreven:
> >
> >> On Fri, Apr 22, 2011 at 12:24 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> >>>
> >>> This fixes Bug [YOCTO #477]
> >>>
> >>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> >>> ---
> >>>  .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
> >>>  1 files changed, 7 insertions(+), 1 deletions(-)
> >>>
> >>> diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> >>> index 7d73dc2..24b3ff2 100644
> >>> --- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> >>> +++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
> >>> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
> >>>  LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
> >>>  # cairo >= 1.8.8
> >>>  DEPENDS = "cairo"
> >>> -PR = "ml0"
> >>> +PR = "r1"
> >>
> >> any reason not to use mlX
> >
> > Because rX is a standard and mlX isn't
> 
> why did we use ml to start with then ?
> 
Its mickeys initials.

G
Nitin A Kamble - April 22, 2011, 10:28 p.m.
> >  # cairo >= 1.8.8

> >  DEPENDS = "cairo"

> > -PR = "ml0"

> > +PR = "r1"

> 

> any reason not to use mlX


The r1 kind of notation makes it consistent with rest of the recipes.

Thanks,
Nitin
Khem Raj - April 22, 2011, 11:51 p.m.
On Fri, Apr 22, 2011 at 10:32 AM, Graeme Gregory <dp@xora.org.uk> wrote:
> On Fri, Apr 22, 2011 at 10:27:31AM -0700, Khem Raj wrote:
>> On Fri, Apr 22, 2011 at 10:25 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> >
>> > Op 22 apr 2011, om 19:16 heeft Khem Raj het volgende geschreven:
>> >
>> >> On Fri, Apr 22, 2011 at 12:24 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> >>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>> >>>
>> >>> This fixes Bug [YOCTO #477]
>> >>>
>> >>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
>> >>> ---
>> >>>  .../python/python-pycairo_1.8.10.bb                |    8 +++++++-
>> >>>  1 files changed, 7 insertions(+), 1 deletions(-)
>> >>>
>> >>> diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> >>> index 7d73dc2..24b3ff2 100644
>> >>> --- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> >>> +++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
>> >>> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & MPLv1.1"
>> >>>  LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
>> >>>  # cairo >= 1.8.8
>> >>>  DEPENDS = "cairo"
>> >>> -PR = "ml0"
>> >>> +PR = "r1"
>> >>
>> >> any reason not to use mlX
>> >
>> > Because rX is a standard and mlX isn't
>>
>> why did we use ml to start with then ?
>>
> Its mickeys initials.

heh

>
> G
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Khem Raj - April 22, 2011, 11:53 p.m.
On Fri, Apr 22, 2011 at 3:28 PM, Kamble, Nitin A
<nitin.a.kamble@intel.com> wrote:
>> >  # cairo >= 1.8.8
>> >  DEPENDS = "cairo"
>> > -PR = "ml0"
>> > +PR = "r1"
>>
>> any reason not to use mlX
>
> The r1 kind of notation makes it consistent with rest of the recipes.


It does, I was just curious about 'ml'
>
> Thanks,
> Nitin
>
>
Michael 'Mickey' Lauer - April 23, 2011, 10:44 a.m.
Feel free to get rid of the ml revision numbers, when you bump
any versions. The reason for that is historic and goes way back
to when I added Python to OpenZaurus, subsequently to OpenEmbedded,
and had to provide upgrade paths for precompiled feeds.

Nowadays the ml suffix has only sentimental value, so feel free
to kill it off where you see fit.

Cheers,

--
:M:

Dr. Michael Lauer
President, OpenEmbedded e.V.

Patch

diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
index 7d73dc2..24b3ff2 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
@@ -6,7 +6,7 @@  LICENSE = "LGPLv2.1 & MPLv1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
 # cairo >= 1.8.8
 DEPENDS = "cairo"
-PR = "ml0"
+PR = "r1"
 
 SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.gz"
 
@@ -16,6 +16,12 @@  S = "${WORKDIR}/pycairo-${PV}"
 
 inherit distutils pkgconfig
 
+do_compile_prepend() {
+#fix the installation path of __init__.py
+#It was going in the sysroot instead of target install location
+	sed -i -e "s#dsy.get_python_lib()#'${D}${PYTHON_SITEPACKAGES_DIR}'#" ${S}/setup.py
+}
+
 do_install_append () {
 	install -d ${D}${includedir}
 	install -d ${D}${libdir}