From 0c5bd68a0aa61ffd98cae9e47f914e1066cfe44b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 28 Jul 2007 18:56:26 +0000 Subject: pkgconfig.bbclass: more munging --- classes/pkgconfig.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') 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 } -- cgit v1.2.3 From 9e69cc753ec5d5a1a8d702356fad0e6e43ff6323 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 17:59:51 +0000 Subject: base.bbclass: Only take the slow path if SRC_URI_OVERRIDES_PACKAGE_ARCH is actually set to something --- classes/base.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') 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)) -- cgit v1.2.3 From d36084001d8e5c40a8f75338c293f0ca99880b85 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 21:23:19 +0000 Subject: sanity.bbclass: Run sanity checker after configuration parsing for bitbake > 1.8.6 --- classes/sanity.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index a0da0667dd..cd3b5efbfe 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -89,7 +89,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" for util in required_utilities.split(): if not check_app_exists( util, e.data ): @@ -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) -- cgit v1.2.3 From f6310c4e838b88abe092d1f8a85881d767aa52be Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 21:24:42 +0000 Subject: santiy.bbclass: Undo accidental change --- classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index cd3b5efbfe..016b0d500b 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -89,7 +89,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" for util in required_utilities.split(): if not check_app_exists( util, e.data ): -- cgit v1.2.3 From 4d57b6bc2f95d8f569db46aa9fb6e02540aa7e46 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 22:20:41 +0000 Subject: image.bbclass: Use system python explicitly, don't use python-native version --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 5f1dfa2dce..05bc9d669b 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -91,7 +91,7 @@ fakeroot do_rootfs () { if test -z "$FAKEROOTKEY"; then fakeroot -i ${TMPDIR}/fakedb.image 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}/ -- cgit v1.2.3 From aacc63c673f2790e14a3c55b6461d68d0022927d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Jul 2007 22:41:37 +0000 Subject: image.bbclass: Fix other bbimage refernce --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 05bc9d669b..101b53307a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -89,7 +89,7 @@ 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 ${PYTHON} `which bbimage` -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi -- cgit v1.2.3