diff options
| author |   Lianhao Lu <lianhao.lu@intel.com> | 2011-09-16 20:28:29 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-16 17:36:26 +0100 |
| commit | e59c4e34daa688c033dd4ac07a69099610ac5705 (patch) | |
| tree | 38ca1e78c2668942828bb198ec407901c11af23d /meta | |
| parent | cb19503139b9102f02ba3e5be63d5e85f280f2ef (diff) | |
| download | openembedded-core-contrib-e59c4e34daa688c033dd4ac07a69099610ac5705.tar.gz | |
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.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/debian.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass index 46a9d089c2..1880830775 100644 --- a/meta/classes/debian.bbclass +++ b/meta/classes/debian.bbclass @@ -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) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index e83aff8fe9..c0893a6cda 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -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} diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 695bee0296..e02b8165b7 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -114,7 +114,7 @@ fakeroot rootfs_ipk_do_rootfs () { rm -rf ${IMAGE_ROOTFS}${opkglibdir} fi fi - + set +x log_check rootfs } |