From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QodV4-0000Ox-OP for openembedded-core@lists.openembedded.org; Wed, 03 Aug 2011 17:36:51 +0200 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca [147.11.189.40]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id p73FWRhc023261 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 3 Aug 2011 08:32:27 -0700 (PDT) Received: from Macintosh-5.local (172.25.36.226) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.1.255.0; Wed, 3 Aug 2011 08:32:26 -0700 Message-ID: <4E396A0A.5010205@windriver.com> Date: Wed, 3 Aug 2011 10:32:26 -0500 From: Mark Hatle Organization: Wind River Systems User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:5.0) Gecko/20110624 Thunderbird/5.0 MIME-Version: 1.0 To: References: In-Reply-To: Subject: Re: [PATCH 5/7] multilib: remove MULTILIB_PACKAGE_ARCHS variable 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: Wed, 03 Aug 2011 15:36:51 -0000 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit On 8/3/11 10:19 AM, Dongxiao Xu wrote: > multilib package and normal package shares the same architecture deploy > folder, thus we do not need the ${MULTILIB_PACKAGE_ARCHS}. This is incorrect behavior, at least for RPM. The folder should have the pkgarch specific to the tuning used to generate the multilib. (Behavior may be correct for deb/ipk.) (If RPM sees two packages with the same .arch, it assumes that it's an upgrade operation. If the .arch is different then it goes into the multilib mode and will be able to install both packages together, assuming the conflict resolution results in a working -- non-conflicting -- install solution.) --Mark > CC: Mark Hatle > Signed-off-by: Dongxiao Xu > --- > meta/classes/package_rpm.bbclass | 13 ++----------- > meta/classes/populate_sdk_rpm.bbclass | 3 --- > meta/classes/rootfs_rpm.bbclass | 3 --- > 3 files changed, 2 insertions(+), 17 deletions(-) > > diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass > index abedc68..9d0eeba 100644 > --- a/meta/classes/package_rpm.bbclass > +++ b/meta/classes/package_rpm.bbclass > @@ -27,8 +27,7 @@ package_update_index_rpm () { > > # Update target packages > base_archs="${PACKAGE_ARCHS}" > - ml_archs="${MULTILIB_PACKAGE_ARCHS}" > - package_update_index_rpm_common "${RPMCONF_TARGET_BASE}" base_archs ml_archs > + package_update_index_rpm_common "${RPMCONF_TARGET_BASE}" base_archs > > # Update SDK packages > base_archs="${SDK_PACKAGE_ARCHS}" > @@ -76,7 +75,7 @@ package_update_index_rpm_common () { > # > package_generate_rpm_conf () { > # Update target packages > - package_generate_rpm_conf_common "${RPMCONF_TARGET_BASE}" base_archs ml_archs > + package_generate_rpm_conf_common "${RPMCONF_TARGET_BASE}" base_archs > > # Update SDK packages > package_generate_rpm_conf_common "${RPMCONF_HOST_BASE}" base_archs > @@ -203,10 +202,6 @@ package_install_internal_rpm () { > > archvar=base_archs > ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,") > - if [ "${ml_pkg}" != "${pkg}" ]; then > - archvar=ml_archs > - fi > - > pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg}) > if [ -z "$pkg_name" ]; then > echo "Unable to find package $pkg ($ml_pkg)!" > @@ -223,10 +218,6 @@ package_install_internal_rpm () { > > archvar=base_archs > ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,") > - if [ "${ml_pkg}" != "${pkg}" ]; then > - archvar=ml_archs > - fi > - > pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg}) > if [ -z "$pkg_name" ]; then > echo "Unable to find package $pkg ($ml_pkg)!" > diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass > index 5fb0234..f33e4a9 100644 > --- a/meta/classes/populate_sdk_rpm.bbclass > +++ b/meta/classes/populate_sdk_rpm.bbclass > @@ -115,7 +115,6 @@ EOF > } > > python () { > - ml_package_archs = "" > multilibs = d.getVar('MULTILIBS', True) or "" > for ext in multilibs.split(): > eext = ext.split(':') > @@ -125,8 +124,6 @@ python () { > localdata.setVar("OVERRIDES", overrides) > # TEMP: OVERRIDES isn't working right > localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") > - ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" > #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) > - bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) > } > > diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass > index 7c06064..c188d27 100644 > --- a/meta/classes/rootfs_rpm.bbclass > +++ b/meta/classes/rootfs_rpm.bbclass > @@ -209,7 +209,6 @@ python () { > bb.data.setVar('RPM_PREPROCESS_COMMANDS', '', d) > bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d) > > - ml_package_archs = "" > multilibs = d.getVar('MULTILIBS', True) or "" > for ext in multilibs.split(): > eext = ext.split(':') > @@ -219,7 +218,5 @@ python () { > localdata.setVar("OVERRIDES", overrides) > # TEMP: OVERRIDES isn't working right > localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") > - ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" > #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) > - bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) > }