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 1SHaCS-0000nn-8k for openembedded-core@lists.openembedded.org; Tue, 10 Apr 2012 14:29:32 +0200 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q3ACKE0M026011 for ; Tue, 10 Apr 2012 13:20:14 +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 22962-09 for ; Tue, 10 Apr 2012 13:20:08 +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 q3ACK7i3025997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 10 Apr 2012 13:20:08 +0100 Message-ID: <1334060407.6861.69.camel@ted> From: Richard Purdie To: Patches and discussions about the oe-core layer Date: Tue, 10 Apr 2012 13:20:07 +0100 In-Reply-To: References: X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-Virus-Scanned: amavisd-new at rpsys.net Subject: Re: [CONSOLIDATED PULL [v2] 10/14] opkg: Add the condition for the content of arch.conf when enable multilib 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: Tue, 10 Apr 2012 12:29:32 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Tue, 2012-04-10 at 00:26 -0700, Saul Wold wrote: > From: Xiaofeng Yan > > After successfully installed some lib32 multilib packages into the > x86-64 image, we just found that the file content of /var/lib/opkg/status in > rootfs changed after the very 1st boot, many lib32 related packages information > are missing in that file. > > The missing arch "x86" in arch.conf cause the above problem. Adding the > condition for the content of arch.conf when enable multilib. If build > multilib image, "ALL_MULTILIB_PACKAGE_ARCHS" will be used instead of > "PACKAGE_ARCHS". > > [YOCTO #1522] > > Signed-off-by: Xiaofeng Yan > --- > meta/recipes-devtools/opkg/opkg-config-base_1.0.bb | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb > index 3a559cb..f37b2db 100644 > --- a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb > +++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb > @@ -9,7 +9,12 @@ do_compile() { > archconf=${S}/${sysconfdir}/opkg/arch.conf > > rm -f $archconf > - ipkgarchs="${PACKAGE_ARCHS}" > + multilibs="${@d.getVar('MULTILIBS',True)}" > + if [ "X${multilibs}" == "XNone" ]; then > + ipkgarchs="${PACKAGE_ARCHS}" > + else > + ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}" > + fi > priority=1 > for arch in $ipkgarchs; do > echo "arch $arch $priority" >> $archconf Sorry, I should be clear in my reply. My question is why isn't there a variable that just lists all of the current compatible package architectures, whether they're multilibs or otherwise. I'm slightly concerned we need this if statement. Its likely cleaning this up is 1.3 material though. Cheers, Richard