Patchwork python: use PKGSUFFIX for libpython2

login
register
mail settings
Submitter Andreas Oberritter
Date April 12, 2012, 2:30 a.m.
Message ID <1334197802-25482-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/25647/
State New
Headers show

Comments

Andreas Oberritter - April 12, 2012, 2:30 a.m.
* python-nativesdk shouldn't provide libpython2, but
  libpython2-nativesdk.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-devtools/python/python_2.7.2.bb |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Saul Wold - April 27, 2012, 9:26 p.m.
On 04/11/2012 07:30 PM, Andreas Oberritter wrote:
> * python-nativesdk shouldn't provide libpython2, but
>    libpython2-nativesdk.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   meta/recipes-devtools/python/python_2.7.2.bb |    9 ++++++---
>   1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
> index 8cf45da..ae08748 100644
> --- a/meta/recipes-devtools/python/python_2.7.2.bb
> +++ b/meta/recipes-devtools/python/python_2.7.2.bb
> @@ -1,6 +1,6 @@
>   require python.inc
>   DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
> -PR = "${INC_PR}.9"
> +PR = "${INC_PR}.10"
>
>   DISTRO_SRC_URI ?= "file://sitecustomize.py"
>   DISTRO_SRC_URI_linuxstdbase = ""
> @@ -128,8 +128,8 @@ RRECOMMENDS_${PN}-core = "${PN}-readline"
>   RRECOMMENDS_${PN}-crypt = "openssl"
>
>   # package libpython2
> -PACKAGES =+ "lib${BPN}2"
> -FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
> +PACKAGES =+ "lib${BPN}2${PKGSUFFIX}"
> +FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*"
>
>   # catch debug extensions (isn't that already in python-core-dbg?)
>   FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
> @@ -143,3 +143,6 @@ PACKAGES += "${PN}-man"
>   FILES_${PN}-man = "${datadir}/man"
>
>   BBCLASSEXTEND = "nativesdk"
> +
> +PKGSUFFIX = ""
> +PKGSUFFIX_virtclass-nativesdk = "-nativesdk"


This was merged into OE-Core along with the 2 wpa-supplicant changes

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 8cf45da..ae08748 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,6 +1,6 @@ 
 require python.inc
 DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
-PR = "${INC_PR}.9"
+PR = "${INC_PR}.10"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""
@@ -128,8 +128,8 @@  RRECOMMENDS_${PN}-core = "${PN}-readline"
 RRECOMMENDS_${PN}-crypt = "openssl"
 
 # package libpython2
-PACKAGES =+ "lib${BPN}2"
-FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
+PACKAGES =+ "lib${BPN}2${PKGSUFFIX}"
+FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*"
 
 # catch debug extensions (isn't that already in python-core-dbg?)
 FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
@@ -143,3 +143,6 @@  PACKAGES += "${PN}-man"
 FILES_${PN}-man = "${datadir}/man"
 
 BBCLASSEXTEND = "nativesdk"
+
+PKGSUFFIX = ""
+PKGSUFFIX_virtclass-nativesdk = "-nativesdk"