diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 11:15:39 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 11:15:39 +0000 |
| commit | 929f61d2aef5cf85e6d88cdbcf542c838a03bf34 (patch) | |
| tree | fa99fe12f0718313365a066d93df646ef6f5ef49 /classes | |
| parent | 22348937cf12a03afe2aaeaa0c297867bb40433b (diff) | |
| parent | 10de3859729ec4a238d66340144a93005fcd0a61 (diff) | |
merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
and '6c89e16689bde0d5bff8b0e47eea04a458190a56'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 5 | ||||
| -rw-r--r-- | classes/image.bbclass | 4 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 4 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d0083bdc54..fec7622f18 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -825,8 +825,11 @@ def base_after_parse(d): if (old_arch == mach_arch): # Nothing to do return - if (bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) == '0'): + override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) + + if not override or override == '0': return + paths = [] for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]: paths.append(bb.data.expand(os.path.join(p, mach_arch), d)) diff --git a/classes/image.bbclass b/classes/image.bbclass index 5f1dfa2dce..101b53307a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -89,9 +89,9 @@ fakeroot do_rootfs () { for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then - fakeroot -i ${TMPDIR}/fakedb.image bbimage -t $type -e ${FILE} + fakeroot -i ${TMPDIR}/fakedb.image ${PYTHON} `which bbimage` -t $type -e ${FILE} else - bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" + ${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi cd ${DEPLOY_DIR_IMAGE}/ diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index cd6e04731e..3256977517 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d): do_install_append () { for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} ${pc} + sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc} done } @@ -32,6 +32,6 @@ do_stage_append () { for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` install -d ${PKG_CONFIG_PATH} - cat $pc | sed ${@get_pkgconfig_mangle(d)} > ${PKG_CONFIG_PATH}/$pcname + cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname done } diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index a0da0667dd..016b0d500b 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -111,6 +111,16 @@ python check_sanity_eventhandler() { from bb import note, error, data, __version__ from bb.event import getName + try: + from distutils.version import LooseVersion + except ImportError: + def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 + + if (LooseVersion(bb.__version__) > LooseVersion("1.8.6")): + if getName(e) == "ConfigParsed": + check_sanity(e) + return NotHandled + if getName(e) == "BuildStarted": check_sanity(e) |