populate_sdk_deb.bbclass: put back INSTALL_PACKAGES_NORMAL_DEB

This commit (0b0674ebcd8a51783e4bb38e3ead3e419dbba376) was also changing
the populate_sdk_deb.bbclass but the deb backend does not support
multilib just yet. So, when compiling the standalone toolchain tarball,
we ended up with an empty tarball if the deb package manager was chosen.

Reverting the deb part until the multilib support is added to deb.

[YOCTO #3532]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index f2d0621b6670079c24d86a38b8b76e7c45c4f11d..48a638e0f272d9c2bdbbbd54f5f895e0ba202fe6 100644 (file)
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -30,7 +30,7 @@ populate_sdk_deb () {
        export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
        export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
        export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
-       export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}"
+       export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
        export PACKAGES_LINGUAS_DEB=""
        export INSTALL_TASK_DEB="populate_sdk-target"
@@ -48,7 +48,7 @@ populate_sdk_deb () {
        export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
        export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
        export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
-       export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}"
+       export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
        export PACKAGES_LINGUAS_DEB=""
        export INSTALL_TASK_DEB="populate_sdk-nativesdk"