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]

(From OE-Core rev: 34baee37caccced13fb26f446b865c9f25edf339)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index f2d0621..48a638e 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"