[oe-commits] org.oe.dev merge of '7299736bd45f29d862cdc7e7e31153ea62402566'

oe commit openembedded-commits at lists.openembedded.org
Thu Dec 6 22:48:42 UTC 2007 

merge of '7299736bd45f29d862cdc7e7e31153ea62402566'
     and 'dec04e494e7ab4322bcd6dc858d4d3689baf8a25'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7bb232aab2fc8a2c8981580dac6a1409b5a0b063
ViewMTN: http://monotone.openembedded.org/revision/info/7bb232aab2fc8a2c8981580dac6a1409b5a0b063
Files:
1
conf/distro/angstrom-2007.1.conf
packages/tasks/task-base.bb
packages/python/python-cython-native_0.9.6.9.bb
packages/python/python-cython_0.9.6.9.bb
packages/python/python-efl.bb
packages/python/python-epsilon_cvs.bb
classes/distutils.bbclass
packages/python/python-ecore_cvs.bb
packages/python/python-efl.inc
Diffs:

#
# mt diff -r7299736bd45f29d862cdc7e7e31153ea62402566 -r7bb232aab2fc8a2c8981580dac6a1409b5a0b063
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [0556daa097782b542ec3ef3bc2bc525d58b78091]
#    to [a59b4bdff5fea83e852628a968abbeb155999248]
# 
# patch "packages/tasks/task-base.bb"
#  from [bd9f0978ca2a00519da16302f7e73d3fad3879fd]
#    to [b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	0556daa097782b542ec3ef3bc2bc525d58b78091
+++ conf/distro/angstrom-2007.1.conf	a59b4bdff5fea83e852628a968abbeb155999248
@@ -30,14 +30,14 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
 IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
 
 # These will be put under package management soon
-FEED_URIS += " \
-		no-arch##${ANGSTROM_URI}/unstable/feed/all \
-		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
+#FEED_URIS += " \
+#		no-arch##${ANGSTROM_URI}/unstable/feed/all \
+#		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
+#		perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
+#		python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
+#		debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
+#		gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
+#		${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
@@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral \
+    ipkg ipkg-collateral angstrom-feed-configs \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
============================================================
--- packages/tasks/task-base.bb	bd9f0978ca2a00519da16302f7e73d3fad3879fd
+++ packages/tasks/task-base.bb	b2a95f7d8e72d2e4046a8e35491b379a2bbd4e2c
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r47"
+PR = "r48"
 
 inherit task
 


#
# mt diff -rdec04e494e7ab4322bcd6dc858d4d3689baf8a25 -r7bb232aab2fc8a2c8981580dac6a1409b5a0b063
#
# 
# 
# add_file "packages/python/python-cython-native_0.9.6.9.bb"
#  content [e1421a5e31559ec41144bbdc77a4c448d493e717]
# 
# add_file "packages/python/python-cython_0.9.6.9.bb"
#  content [0a9a75ec77d6190dc80054f14140c6d397f4f97c]
# 
# add_file "packages/python/python-efl.bb"
#  content [38e140ae1f0addeb5ff6e307653bfd5032f4df82]
# 
# add_file "packages/python/python-epsilon_cvs.bb"
#  content [7bd65f186128ab558629d1d56830b76733712059]
# 
# patch "classes/distutils.bbclass"
#  from [41980eec92cf67538cc2af843af8a2424a084a31]
#    to [d6701363cef5b26ab81a90ffc863f5ea8686cb17]
# 
# patch "packages/python/python-ecore_cvs.bb"
#  from [8ae4047c69093053f4e143c210798f9df1ea20db]
#    to [bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699]
# 
# patch "packages/python/python-efl.inc"
#  from [80730c5bf36a6a6a0cbbbb65f28daf6416921c23]
#    to [52c210d09e0ffddb7db102b3f81f7759c1f7991d]
# 
============================================================
--- packages/python/python-cython-native_0.9.6.9.bb	e1421a5e31559ec41144bbdc77a4c448d493e717
+++ packages/python/python-cython-native_0.9.6.9.bb	e1421a5e31559ec41144bbdc77a4c448d493e717
@@ -0,0 +1,9 @@
+require python-cython_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
============================================================
--- packages/python/python-cython_0.9.6.9.bb	0a9a75ec77d6190dc80054f14140c6d397f4f97c
+++ packages/python/python-cython_0.9.6.9.bb	0a9a75ec77d6190dc80054f14140c6d397f4f97c
@@ -0,0 +1,13 @@
+DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
+It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
+and the messy, low-level world of C."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "cython"
+PR = "ml0"
+
+SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
============================================================
--- packages/python/python-efl.bb	38e140ae1f0addeb5ff6e307653bfd5032f4df82
+++ packages/python/python-efl.bb	38e140ae1f0addeb5ff6e307653bfd5032f4df82
@@ -0,0 +1,7 @@
+DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
+LICENSE = "MIT"
+SECTION = "devel/python"
+DEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon"
+
+ALLOW_EMPTY = "1"
+
============================================================
--- packages/python/python-epsilon_cvs.bb	7bd65f186128ab558629d1d56830b76733712059
+++ packages/python/python-epsilon_cvs.bb	7bd65f186128ab558629d1d56830b76733712059
@@ -0,0 +1,4 @@
+require python-efl.inc
+DEPENDS += "epsilon python-ecore"
+
+PR = "r0"
============================================================
--- classes/distutils.bbclass	41980eec92cf67538cc2af843af8a2424a084a31
+++ classes/distutils.bbclass	d6701363cef5b26ab81a90ffc863f5ea8686cb17
@@ -13,13 +13,15 @@ distutils_stage_headers() {
 }
 
 distutils_stage_headers() {
+        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
         oefatal "python setup.py install_headers execution failed."
 }
 
 distutils_stage_all() {
-        install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+        install -d ${STAGING_DIR_HOST}${layout_prefix}/lib/${PYTHON_DIR}/site-packages
+        # is this missing a lib below?
         PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
@@ -49,7 +51,7 @@ distutils_do_install() {
             done
         fi
 
-	rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
+        rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
 }
 
 EXPORT_FUNCTIONS do_compile do_install
============================================================
--- packages/python/python-ecore_cvs.bb	8ae4047c69093053f4e143c210798f9df1ea20db
+++ packages/python/python-ecore_cvs.bb	bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699
@@ -1,5 +1,9 @@ DEPENDS += "ecore"
 require python-efl.inc
 DEPENDS += "ecore"
 
-PR = "r1"
+PR = "r2"
 
+do_stage() {
+    distutils_stage_all
+}
+
============================================================
--- packages/python/python-efl.inc	80730c5bf36a6a6a0cbbbb65f28daf6416921c23
+++ packages/python/python-efl.inc	52c210d09e0ffddb7db102b3f81f7759c1f7991d
@@ -1,18 +1,16 @@ HOMEPAGE = "http://www.enlightenment.org
 DESCRIPTION = "${PN} bindings"
 LICENSE = "BSD"
 AUTHOR = "Gustavo Sverzut Barbieri <barbieri at gmail.com>"
 HOMEPAGE = "http://www.enlightenment.org"
-DEPENDS = "python-pyrex-native python-numeric"
+# somewhere is a bug. cython should be self-contained, but somehow this
+# does not compile unless pyrex has been built
+DEPENDS = "python-cython-native python-pyrex-native python-numeric"
 PV = "0.1.1+cvs${SRCDATE}"
 
-inherit distutils
+inherit setuptools
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}"
 S = "${WORKDIR}/${PN}"
 
-do_install_append() {
-	rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.*
-}
-
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"

More information about the Openembedded-commits mailing list