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>

diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 46a9d089c27786ee0836919c5620f64c71203bc9..1880830775266b5461c1c1b2bf6f7622e4fd3f61 100644 (file)
--- 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 e83aff8fe99f1aa9b6ca0c45a561767b528c45b0..c0893a6cdac6c8abae3255e56a498ce9ebecfb7e 100644 (file)
--- 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 695bee0296afdbe513361d8f3738e7057c5bea9e..e02b8165b79847dd695dbb6bd68de83f121ef962 100644 (file)
--- 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        
 }