From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TIhk3-0001LB-Rl for openembedded-core@lists.openembedded.org; Mon, 01 Oct 2012 17:17:08 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q91F4AGM003912; Mon, 1 Oct 2012 16:04:10 +0100 Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 03678-02; Mon, 1 Oct 2012 16:04:06 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q91F406S003906 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 1 Oct 2012 16:04:01 +0100 Message-ID: <1349103842.15753.105.camel@ted> From: Richard Purdie To: Mark Hatle Date: Mon, 01 Oct 2012 16:04:02 +0100 In-Reply-To: <5069AE63.7020807@windriver.com> References: <81b24042824b81344141c7dcaffbfe74354bc635.1348963477.git.mark.hatle@windriver.com> <1349096953.15753.97.camel@ted> <5069AE63.7020807@windriver.com> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 X-Virus-Scanned: amavisd-new at rpsys.net Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 04/12] bb.utils.explode_dep_versions: Update to ensure we avoid duplicate deps X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 15:17:08 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 > >> --- > >> 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