From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 8E59F60E68 for ; Fri, 28 Mar 2014 10:28:37 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id s2SASaQ5005064 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 28 Mar 2014 03:28:36 -0700 (PDT) Received: from [128.224.162.194] (128.224.162.194) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.169.1; Fri, 28 Mar 2014 03:28:36 -0700 Message-ID: <53354EC8.1070909@windriver.com> Date: Fri, 28 Mar 2014 18:28:24 +0800 From: Hongxu Jia User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Martin Jansa References: <83f0a66f2733ddb620e210ff46fbe67e86d74ceb.1395996410.git.hongxu.jia@windriver.com> <20140328101745.GB3714@jama> In-Reply-To: <20140328101745.GB3714@jama> Cc: saul.wold@intel.com, openembedded-core@lists.openembedded.org Subject: Re: [PATCH 5/5] libc-common.bbclass: rename ALL the packages X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 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: Fri, 28 Mar 2014 10:28:39 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 03/28/2014 06:17 PM, Martin Jansa wrote: > On Fri, Mar 28, 2014 at 05:43:54PM +0800, Hongxu Jia wrote: >> From: Peter Seebach >> >> The DEBIAN_NAMES feature renames some of the libc packages to >> "libc6*" names --but only some. A previous patch added the -dbg >> package. However, this doesn't cover other packages (such as >> the -doc package), and it didn't take multilibs into account. >> >> Signed-off-by: Peter Seebach >> Signed-off-by: Jeff Polk >> Signed-off-by: Mark Hatle >> Signed-off-by: Hongxu Jia >> --- >> meta/classes/libc-common.bbclass | 19 +++++++++++++------ >> 1 file changed, 13 insertions(+), 6 deletions(-) >> >> diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass >> index daf499d..53bf467 100644 >> --- a/meta/classes/libc-common.bbclass >> +++ b/meta/classes/libc-common.bbclass >> @@ -25,12 +25,19 @@ def get_libc_fpu_setting(bb, d): >> >> python populate_packages_prepend () { >> if d.getVar('DEBIAN_NAMES', True): >> + pkgs = d.getVar('PACKAGES', True).split() >> bpn = d.getVar('BPN', True) >> - d.setVar('PKG_'+bpn, 'libc6') >> - d.setVar('PKG_'+bpn+'-dev', 'libc6-dev') >> - d.setVar('PKG_'+bpn+'-dbg', 'libc6-dbg') >> + prefix = d.getVar('MLPREFIX', True) or "" >> + # Set the base package... >> + d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') >> + initial = prefix + bpn + '-' > I would prefer better variable name here, first thing on my mind when > I've seen it was eglibc-initial and I was wondering why should all libc > packages be renamed like that. Yep, how about 'libcprefix' instead, s/initial/libcprefix/ //Hongxu >> + for p in pkgs: >> + # And all the subpackages. >> + if p.startswith(initial): >> + renamed = p.replace(bpn, 'libc6', 1) >> + d.setVar('PKG_' + p, renamed) >> # For backward compatibility with old -dbg package >> - d.appendVar('RPROVIDES_' + bpn + '-dbg', ' libc-dbg') >> - d.appendVar('RCONFLICTS_' + bpn + '-dbg', ' libc-dbg') >> - d.appendVar('RREPLACES_' + bpn + '-dbg', ' libc-dbg') >> + d.appendVar('RPROVIDES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') >> + d.appendVar('RCONFLICTS_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') >> + d.appendVar('RREPLACES_' + initial + 'dbg', ' ' + prefix + 'libc-dbg') >> } >> -- >> 1.8.1.2 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core