From 57bd62ad5c623216b50393841e1e75c867894765 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Tue, 16 Aug 2011 16:26:49 +0800 Subject: package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS [YOCTO #1345] The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this new value insteald of the PACKAGE_ARCHS to update the opkg indexes and to generate the opkg configuration files. This allows the normal packages and multilib packages may be installed into the same rootfs. (From OE-Core rev: b774bf44ef004276da12a83ebd69715c00b596ac) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'meta/classes/package.bbclass') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 100f465d9c..96675dedb6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -46,6 +46,8 @@ PKGDEST = "${WORKDIR}/packages-split" LOCALE_SECTION ?= '' +ALL_MULTILIB_PACKAGE_ARCHS = "${@all_multilib_tune_values(d, 'PACKAGE_ARCHS')}" + # rpm is used for the per-file dependency identification PACKAGE_DEPENDS += "rpm-native" @@ -184,17 +186,6 @@ python () { bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d) else: d.setVar("PACKAGERDEPTASK", "") - - multilib_archs = [] - multilibs= d.getVar('MULTILIBS', True) or "" - if multilibs: - for ext in multilibs.split(): - eext = ext.split(':') - if len(eext) > 1: - if eext[0] == 'multilib': - multilib_archs.append('ml' + eext[1]) - - d.setVar("MULTILIB_ARCHS", ' '.join(multilib_archs)) } def splitfile(file, debugfile, debugsrcdir, d): -- cgit v1.2.3-54-g00ecf