debian/_ipk.bbclass: Added multilib support for package_name_hook()

[YOCTO #1486]
1. Added multilib support for package_name_hook() so MLPREFIX is kept in
the final package name.

2. clean the output of log_check_ipk.

(From OE-Core rev: e59c4e34daa688c033dd4ac07a69099610ac5705)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Lianhao Lu 2011-09-16 20:28:29 +08:00 committed by Richard Purdie
parent f5a1b3c8f7
commit 27f8868509
3 changed files with 6 additions and 1 deletions

View File

@ -104,6 +104,10 @@ python debian_package_name_hook () {
newpkg = pkgname
else:
newpkg = pkg.replace(orig_pkg, devname, 1)
mlpre=bb.data.getVar('MLPREFIX', d, True)
if mlpre:
if not newpkg.find(mlpre) == 0:
newpkg = mlpre + newpkg
if newpkg != pkg:
bb.data.setVar('PKG_' + pkg, newpkg, d)

View File

@ -75,6 +75,7 @@ package_tryout_install_multilib_ipk() {
fi
done
if [ ! -z "${selected_pkg}" ]; then
rm -f ${target_rootfs}
mkdir -p ${target_rootfs}/${opkglibdir}
opkg-cl ${ipkg_args} update
opkg-cl ${ipkg_args} install ${selected_pkg}

View File

@ -114,7 +114,7 @@ fakeroot rootfs_ipk_do_rootfs () {
rm -rf ${IMAGE_ROOTFS}${opkglibdir}
fi
fi
set +x
log_check rootfs
}