From: Martin Jansa <martin.jansa@gmail.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 01/15] classes/recipes/lib: Fix various python whitespace issues
Date: Tue, 7 May 2013 17:37:16 +0200 [thread overview]
Message-ID: <20130507153716.GE3187@jama> (raw)
In-Reply-To: <1367931368-21504-1-git-send-email-richard.purdie@linuxfoundation.org>
[-- Attachment #1: Type: text/plain, Size: 3309 bytes --]
On Tue, May 07, 2013 at 01:55:53PM +0100, Richard Purdie wrote:
> There are some left over tab characters in the python functions. This
> removes them and resolves python 3 errors.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> @@ -202,13 +202,13 @@ def package_qa_check_useless_rpaths(file, name, d, elf, messages):
> import re
> rpath_re = re.compile("\s+RPATH\s+(.*)")
> for line in phdrs.split("\n"):
> - m = rpath_re.match(line)
> - if m:
> - rpath = m.group(1)
> - if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
> - # The dynamic linker searches both these places anyway. There is no point in
> - # looking there again.
> - messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
> + m = rpath_re.match(line)
> + if m:
> + rpath = m.group(1)
> + if rpath_eq(rpath, libdir) or rpath_eq(rpath, base_libdir):
> + # The dynamic linker searches both these places anyway. There is no point in
> + # looking there again.
> + messages.append("%s: %s contains probably-redundant RPATH %s" % (name, package_qa_clean_path(file, d), rpath))
last 2 blocks are indented only by 3 spaces
> if not sane:
> messages.append("ELF binary '%s' has relocations in .text" % path)
> @@ -498,7 +498,7 @@ def package_qa_hash_style(path, name, d, elf, messages):
> if "GNU_HASH" in line:
> sane = True
> if "[mips32]" in line or "[mips64]" in line:
> - sane = True
> + sane = True
this has 5 spaces
>
> if has_syms and not sane:
> messages.append("No GNU_HASH in the elf binary: '%s'" % path)
> diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
> index 529e82a..40ae006 100644
> --- a/meta/classes/multilib_global.bbclass
> +++ b/meta/classes/multilib_global.bbclass
> @@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
> if isinstance(e, bb.event.RecipePreFinalise):
> for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
> if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
> - e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
> + e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
3 spaces again
>
> variant = e.data.getVar("BBEXTENDVARIANT", True)
>
> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> index 24c7ce8..3218754 100644
> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> @@ -142,6 +142,6 @@ CSL_VER_MAIN ??= ""
>
> python () {
> if not d.getVar("CSL_VER_MAIN"):
> - raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).")
> + raise bb.parse.SkipPackage("External CSL toolchain not configured (CSL_VER_MAIN not set).")
spaces AND tab
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
prev parent reply other threads:[~2013-05-07 15:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 12:55 [PATCH 01/15] classes/recipes/lib: Fix various python whitespace issues Richard Purdie
2013-05-07 12:55 ` [PATCH 02/15] core-image-minimal-initramfs: Remove odd quote characters Richard Purdie
2013-05-07 15:38 ` Martin Jansa
2013-05-07 12:55 ` [PATCH 03/15] clases/lib: Use modern exception syntax Richard Purdie
2013-05-07 12:55 ` [PATCH 04/15] classes: Use modern exception raising syntax Richard Purdie
2013-05-07 12:55 ` [PATCH 05/15] classes/lib: Update to use print as a function call Richard Purdie
2013-05-07 15:40 ` Martin Jansa
2013-05-07 12:55 ` [PATCH 06/15] buildstats: Update to ensure files are closed Richard Purdie
2013-05-07 12:55 ` [PATCH 07/15] bin/bitbake: Ensure early errors are shown to the user Richard Purdie
2013-05-13 1:31 ` Jonathan Liu
2013-05-07 12:56 ` [PATCH 08/15] meta/lib/oe: Replace StandardError with Exception Richard Purdie
2013-05-07 12:56 ` [PATCH 09/15] sanity.bbclass: Use open(), not file() Richard Purdie
2013-05-07 12:56 ` [PATCH 10/15] metadata_scm: Replace depracated operator Richard Purdie
2013-05-07 13:11 ` Phil Blundell
2013-05-07 12:56 ` [PATCH 11/15] insane: Open file in binary mode Richard Purdie
2013-05-07 12:56 ` [PATCH 12/15] image/kernel-module-split/eglibc-ld.inc: Remove has_key() usage Richard Purdie
2013-05-07 12:56 ` [PATCH 13/15] sanity/patch.py: Remove commands module usage Richard Purdie
2013-05-07 12:56 ` [PATCH 14/15] bitbake.conf: Use casting to ensure valid comparision Richard Purdie
2013-05-07 12:56 ` [PATCH 15/15] base.bbclass: Drop unused/obsolete import Richard Purdie
2013-05-07 15:37 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130507153716.GE3187@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox