diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:47:36 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 11:47:36 +0000 |
| commit | 81d59df280284eb7e72f16aff290f238a88204db (patch) | |
| tree | d19ef61e82eca62d59d29958ae21617fa755568e | |
| parent | acf313c21359e68fcba042d80ea0e0353aae7b92 (diff) | |
| parent | f7f978ec4687b54a09967df27fbbce9a399d9cff (diff) | |
merge of '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'
and 'f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad'
| -rw-r--r-- | classes/distutils-base.bbclass | 15 | ||||
| -rw-r--r-- | packages/images/moko-underground-image.bb | 6 | ||||
| -rw-r--r-- | packages/python/python-dbus_0.82.4.bb | 3 |
3 files changed, 19 insertions, 5 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 5150be76b9..c4551ace83 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -11,8 +11,17 @@ def python_dir(d): raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" PYTHON_DIR = "${@python_dir(d)}" + +PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" + FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" -FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ - ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug" +FILES_${PN}-dev += "\ + ${libdir}/pkgconfig \ + ${libdir}/${PYTHON_DIR}/site-packages/*.la \ +" +FILES_${PN}-dbg = "\ + ${libdir}/${PYTHON_DIR}/site-packages/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ + ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \ +" diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index 44dc3bc137..f86fcfba58 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -24,7 +24,11 @@ IMAGE_INSTALL = "\ xhost \ xset \ xrandr \ - " + \ + gsm0710muxd \ + pyneod \ + pyneog \ +" DEPENDS = "\ ${MACHINE_TASK_PROVIDER} \ diff --git a/packages/python/python-dbus_0.82.4.bb b/packages/python/python-dbus_0.82.4.bb index c17f1c766b..8e80882a30 100644 --- a/packages/python/python-dbus_0.82.4.bb +++ b/packages/python/python-dbus_0.82.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "MIT" DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" RDEPENDS = "python-threading python-io python-stringold python-logging" -PR = "ml1" +PR = "ml2" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" S = "${WORKDIR}/dbus-python-${PV}" @@ -18,3 +18,4 @@ do_stage() { autotools_stage_all } +FILES_${PN}-dev += "${libdir}/pkgconfig |