From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com ([134.134.136.24]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T26Sb-00028y-KP for openembedded-core@lists.openembedded.org; Thu, 16 Aug 2012 22:14:29 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 16 Aug 2012 13:02:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,780,1336374000"; d="scan'208";a="187382033" Received: from unknown (HELO [10.255.12.253]) ([10.255.12.253]) by orsmga002.jf.intel.com with ESMTP; 16 Aug 2012 13:02:30 -0700 Message-ID: <502D51D6.9060804@linux.intel.com> Date: Thu, 16 Aug 2012 13:02:30 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1343923596-28854-1-git-send-email-yao.zhao@windriver.com> <502D325C.8020405@linux.intel.com> In-Reply-To: <502D325C.8020405@linux.intel.com> Subject: Re: [PATCH] base.bbclass: fix PACKAGECONFIG handling code X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 20:14:29 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 08/16/2012 10:48 AM, Saul Wold wrote: > On 08/02/2012 09:06 AM, Yao Zhao wrote: >> PACKAGECONFIG flag code only handles that when it has 3 or 4 items in >> flag, >> it may have a stale data if some flags doesn't need DEPENDS and RDEPENDS. >> >> Signed-off-by: Yao Zhao >> --- >> meta/classes/base.bbclass | 25 ++++++++++++------------- >> 1 file changed, 12 insertions(+), 13 deletions(-) >> >> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass >> index e15fa26..3e6a7de 100644 >> --- a/meta/classes/base.bbclass >> +++ b/meta/classes/base.bbclass >> @@ -364,20 +364,19 @@ python () { >> if flag == "defaultval": >> continue >> items = flagval.split(",") >> - if len(items) == 3: >> - enable, disable, depend = items >> - rdepend = "" >> - elif len(items) == 4: >> - enable, disable, depend, rdepend = items >> + num = len(items) >> + if num > 4: >> + bb.error("Only enable,disable,depend,rdepend can be >> specified!") >> + >> if flag in pkgconfig: >> - if depend: >> - extradeps.append(depend) >> - if rdepend: >> - extrardeps.append(rdepend) >> - if enable: >> - extraconf.append(enable) >> - elif disable: >> - extraconf.append(disable) >> + if num >= 3 and items[2]: >> + extradeps.append(items[2]) >> + if num >= 4 and items[3]: >> + extrardeps.append(items[3]) >> + if num >= 1 and items[0]: >> + extraconf.append(items[0]) >> + elif num >= 2 and items[1]: >> + extraconf.append(items[1]) >> appendVar('DEPENDS', extradeps) >> appendVar('RDEPENDS_${PN}', extrardeps) >> appendVar('EXTRA_OECONF', extraconf) >> > > Merged into OE-Core > My mistake not merged. Sau! > Thanks > Sau! > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > >