[oe-commits] : package.bbclass: apply patch from Tom Rini to avoid RDEPENDS on nonexistent empty packages
OE GIT Trial
gittrial at amethyst.openembedded.net
Wed Sep 17 16:07:39 UTC 2008
Module: OE.dev
Branch: org.openembedded.dev
Commit: 55a5dd4b374328752ed0c3340226ec688d16957c
URL: http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=55a5dd4b374328752ed0c3340226ec688d16957c
Author: <pb at openembedded.org>
Date: Wed Sep 17 15:44:58 2008 +0000
package.bbclass: apply patch from Tom Rini to avoid RDEPENDS on nonexistent empty packages
---
classes/package.bbclass | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 4079e11..f740906 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -365,6 +365,8 @@ python populate_packages () {
os.system('rm -rf %s' % pkgdest)
seen = []
+ main_is_empty = 1
+ main_pkg = bb.data.getVar('PN', d, 1)
for pkg in package_list:
localdata = bb.data.createCopy(d)
@@ -409,6 +411,8 @@ python populate_packages () {
ret = bb.copyfile(file, fpath)
if ret is False or ret == 0:
raise bb.build.FuncFailed("File population failed")
+ if pkg == main_pkg and main_is_empty:
+ main_is_empty = 0
del localdata
os.chdir(workdir)
@@ -453,7 +457,11 @@ python populate_packages () {
dangling_links[pkg].append(os.path.normpath(target))
for pkg in package_list:
- rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "")
+ rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
+
+ remstr = "${PN} (= ${DEBPV})"
+ if main_is_empty and remstr in rdepends:
+ rdepends.remove(remstr)
for l in dangling_links[pkg]:
found = False
bb.debug(1, "%s contains dangling link %s" % (pkg, l))
More information about the Openembedded-commits
mailing list