diff options
| author | Philip Balister <philip@balister.org> | 2006-10-20 19:02:37 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2006-10-20 19:02:37 +0000 |
| commit | 3c38e235695be35e780db6da7b4817c894d84f90 (patch) | |
| tree | c54953ee8a25f4e44ad59d7681c4f134d6d440a6 /classes/base.bbclass | |
| parent | da2a59a265c630e77b61070b5112e8a886d15f61 (diff) | |
| parent | 4efda0e0f2a5728abd931d0f40f5df7ce80966bb (diff) | |
merge of '5766b94f1120049e60998bb120cf4519a884d89d'
and 'a16077ae45108937659058d6916e0e2737965ec7'
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 0e864457ab..eda1b23b04 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -575,7 +575,7 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T ${STAGING_DATADIR} \ ${S} ${B}" -addtask populate_staging after do_package +addtask populate_staging after do_package_write python do_populate_staging () { bb.build.exec_func('do_stage', d) @@ -599,9 +599,6 @@ do_build[func] = "1" # Functions that update metadata based on files outputted # during the build process. -SHLIBS = "" -RDEPENDS_prepend = " ${SHLIBS}" - def explode_deps(s): r = [] l = s.split() @@ -619,27 +616,6 @@ def explode_deps(s): r.append(i) return r -python read_shlibdeps () { - packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - for pkg in packages: - rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - shlibsfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d) - if os.access(shlibsfile, os.R_OK): - fd = file(shlibsfile) - lines = fd.readlines() - fd.close() - for l in lines: - rdepends.append(l.rstrip()) - pcfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d) - if os.access(pcfile, os.R_OK): - fd = file(pcfile) - lines = fd.readlines() - fd.close() - for l in lines: - rdepends.append(l.rstrip()) - bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d) -} - def read_pkgdatafile(fn): pkgdata = {} |