From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Mark Hatle <mark.hatle@windriver.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 04/12] bb.utils.explode_dep_versions: Update to ensure we avoid duplicate deps
Date: Mon, 01 Oct 2012 16:04:02 +0100 [thread overview]
Message-ID: <1349103842.15753.105.camel@ted> (raw)
In-Reply-To: <5069AE63.7020807@windriver.com>
On Mon, 2012-10-01 at 09:53 -0500, Mark Hatle wrote:
> On 10/1/12 8:09 AM, Richard Purdie wrote:
> > On Sat, 2012-09-29 at 19:19 -0500, Mark Hatle wrote:
> >> Due to a recent change in bb.utils.explode_dep_version, we need to make
> >> sure that we do not have any duplicates in things that use
> >> explode_dep_versions.
> >>
> >> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> >> ---
> >> meta/classes/insane.bbclass | 55 +++++++++++++++++++++++++++++++++-
> >> meta/classes/kernel.bbclass | 20 +++++++-----
> >> meta/classes/libc-common.bbclass | 13 ++++++--
> >> meta/classes/package.bbclass | 20 ++++++++++--
> >> meta/classes/package_rpm.bbclass | 61 +++++++++++++++++++++-----------------
> >> 5 files changed, 125 insertions(+), 44 deletions(-)
> >>
> >> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> >> index 1fb8970..17d887a 100644
> >> --- a/meta/classes/insane.bbclass
> >> +++ b/meta/classes/insane.bbclass
> >> @@ -114,7 +114,7 @@ def package_qa_get_machine_dict():
> >>
> >> # Currently not being used by default "desktop"
> >> WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts staticdev libdir"
> >> -ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms"
> >> +ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms dep-cmp"
> >>
> >> ALL_QA = "${WARN_QA} ${ERROR_QA}"
> >>
> >> @@ -659,6 +659,54 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
> >>
> >> return sane
> >>
> >> +def package_qa_check_deps(pkg, pkgdest, skip, d):
> >> + sane = True
> >> +
> >> + # Copied from package_ipk.bbclass
> >> + # boiler plate to update the data
> >> + localdata = bb.data.createCopy(d)
> >> + root = "%s/%s" % (pkgdest, pkg)
> >> +
> >> + localdata.setVar('ROOT', '')
> >> + localdata.setVar('ROOT_%s' % pkg, root)
> >
> >
> > Nothing here uses ROOT or root so these can be removed?
> >
> >> + pkgname = localdata.getVar('PKG_%s' % pkg, True)
> >> + if not pkgname:
> >> + pkgname = pkg
> >> + localdata.setVar('PKG', pkgname)
> >
> > Again, these look surplus to requirements?
> >
> >> + localdata.setVar('OVERRIDES', pkg)
> >> +
> >> + bb.data.update_data(localdata)
> >> +
>
> I'll get this fixed and resubmitted.
I'm trying to find you on irc as we need to talk a bit more about
things.
With the above, I realised you copy and pasted some other code so I have
a cleanup patch for both now.
I don't think the ValueError is going to cut it, particularly this close
to release. I'm working on replacing the function usage with an improved
one which can cope with the duplicates.
Cheers,
Richard
next prev parent reply other threads:[~2012-10-01 15:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-30 0:19 [PATCH 00/12] Multilib, duplicate deps, and misc cleanup Mark Hatle
2012-09-30 0:19 ` [PATCH 01/12] multilib: Add support for cross-canadian multilib packages Mark Hatle
2012-09-30 0:19 ` [PATCH 02/12] multilib - crosssdk: Stop building multilib for crosssdk packages Mark Hatle
2012-09-30 0:19 ` [PATCH 03/12] populate_sdk_base: Update extraction script for multilibs Mark Hatle
2012-10-01 13:17 ` Richard Purdie
2012-10-01 14:55 ` Mark Hatle
2012-10-01 15:17 ` Laurentiu Palcu
2012-10-01 15:25 ` Mark Hatle
2012-10-01 15:47 ` Laurentiu Palcu
2012-09-30 0:19 ` [PATCH 04/12] bb.utils.explode_dep_versions: Update to ensure we avoid duplicate deps Mark Hatle
2012-10-01 13:09 ` Richard Purdie
2012-10-01 14:53 ` Mark Hatle
2012-10-01 15:04 ` Richard Purdie [this message]
2012-09-30 0:19 ` [PATCH 05/12] package_deb/ipk: Remap < and > to << and >> Mark Hatle
2012-09-30 0:19 ` [PATCH 06/12] libxcb: Update DEPENDS to avoid duplicate entries Mark Hatle
2012-09-30 0:19 ` [PATCH 07/12] Cleanup: fix PN == BPN cases Mark Hatle
2012-09-30 0:19 ` [PATCH 08/12] multilib: Move redefinition of STAGING_DIR_KERNEL Mark Hatle
2012-09-30 0:19 ` [PATCH 09/12] rpm-native: Fix 'uuid_rc_t' undeclared error when compiling Mark Hatle
2012-09-30 0:19 ` [PATCH 10/12] rpm: Fix file contention issue Mark Hatle
2012-09-30 0:19 ` [PATCH 11/12] rpm: Add rpm patch to fix git_strerror issues Mark Hatle
2012-09-30 0:19 ` [PATCH 12/12] rpm: Implement workaround for DB_BUFFER_SMALL error Mark Hatle
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=1349103842.15753.105.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=mark.hatle@windriver.com \
--cc=openembedded-core@lists.openembedded.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