summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-08-30 14:14:41 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2009-08-30 14:14:41 +0200
commit0d2248860e7da5059be79bf79f266c78b5c30b2f (patch)
treef05bde69ced8b7b830018e15b098c3990e4964e3
parentcbca70add0d3c814c25cde9fe7afff2e3a0344d3 (diff)
parent1d32651d78dfed06579231a6ff6b63e2b79d59cf (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
-rw-r--r--recipes/erlang/erlang_R13B01.bb6
-rw-r--r--recipes/python/python-pygobject_2.16.0.bb1
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes/erlang/erlang_R13B01.bb b/recipes/erlang/erlang_R13B01.bb
index eda4db67a4..ec9fdfbfb6 100644
--- a/recipes/erlang/erlang_R13B01.bb
+++ b/recipes/erlang/erlang_R13B01.bb
@@ -1,7 +1,7 @@
include erlang.inc
DEPENDS += "erlang-native openssl"
-PR = "r1"
+PR = "r2"
SRC_URI += "\
file://erts-emulator-Makefile.in.patch;patch=1 \
@@ -71,6 +71,6 @@ def get_erlang_libs_R13B01(d):
libs.sort()
return libs
-FILES_${PN}-dbg += " ${libdir}/erlang/bin/.debug ${libdir}/erlang/*/bin/.debug ${libdir}/erlang/lib/*/bin/.debug"
+FILES_${PN}-libs-dbg += " ${libdir}/erlang/*/.debug ${libdir}/erlang/*/*/.debug ${libdir}/erlang/*/*/*/.debug ${libdir}/erlang/*/*/*/*/.debug ${libdir}/erlang/*/*/*/*/*/.debug "
FILES_${PN}-libs += " ${@' '.join(get_erlang_libs_R13B01(d))}"
-PACKAGES =+ "${PN}-libs"
+PACKAGES =+ "${PN}-libs-dbg ${PN}-libs"
diff --git a/recipes/python/python-pygobject_2.16.0.bb b/recipes/python/python-pygobject_2.16.0.bb
index d7bd1c041f..f11d6da012 100644
--- a/recipes/python/python-pygobject_2.16.0.bb
+++ b/recipes/python/python-pygobject_2.16.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Python GObject bindings"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "python-pygobject-native-${PV}"
+PE = "1"
PR = "ml2"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"