aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2011-04-27 17:09:58 +0200
committerKoen Kooi <koen@openembedded.org>2011-04-28 14:08:43 +0200
commita4cade4c1fad9fe43e94943981f9a94eb0971261 (patch)
treeca1bc610df81d89f7e90d9b5a93ed1155bcd4ea5
parentf4aa7b68e5c714d6c23ee4bc55c49ea0ae52abb3 (diff)
downloadopenembedded-a4cade4c1fad9fe43e94943981f9a94eb0971261.zip
openembedded-a4cade4c1fad9fe43e94943981f9a94eb0971261.tar.gz
openembedded-a4cade4c1fad9fe43e94943981f9a94eb0971261.tar.bz2
opencv 2.2: fix opencv-dev dependency chain
installing 'opencv-dev' will now drag in all the generated -dev packages Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--recipes/opencv/opencv_2.2.bb14
1 files changed, 13 insertions, 1 deletions
diff --git a/recipes/opencv/opencv_2.2.bb b/recipes/opencv/opencv_2.2.bb
index b08da77..99175e8 100644
--- a/recipes/opencv/opencv_2.2.bb
+++ b/recipes/opencv/opencv_2.2.bb
@@ -16,7 +16,7 @@ PARALLEL_MAKE = ""
SRCREV = "4812"
PV = "2.2.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/opencv"
@@ -38,6 +38,18 @@ python populate_packages_prepend () {
do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+
+ pn = bb.data.getVar('PN', d, 1)
+ metapkg = pn + '-dev'
+ bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+ bb.data.setVar('FILES_' + metapkg, "", d)
+ blacklist = [ metapkg ]
+ metapkg_rdepends = [ ]
+ packages = bb.data.getVar('PACKAGES', d, 1).split()
+ for pkg in packages[1:]:
+ if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'):
+ metapkg_rdepends.append(pkg)
+ bb.data.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
}
FILES_${PN} = ""