populate_sdk_deb: Fix meta-toolchain-sdk with amd64 ARCH1.6_M4

Map SDK_ARCH x86_64 to DEB_SDK_ARCH amd64

Without this patch meta-toolchain-gmae fails to do_populate_sdk

| The following packages have unmet dependencies:
|  nativesdk-packagegroup-sdk-host : Depends: nativesdk-autoconf but it
is not installable
|                                    Depends: nativesdk-libtool but it
is not installable
|                                    Depends: nativesdk-shadow but it is
not installable
|                                    Depends: nativesdk-unfs-server but
it is not installable
|                                    Depends: nativesdk-makedevs but it
is not installable
|                                    Depends: nativesdk-automake but it
is not installable
|                                    Depends: nativesdk-qemu but it is
not installable
|                                    Depends: nativesdk-pkgconfig but it
is not installable
|                                    Depends: nativesdk-pseudo but it is
not installable
|                                    Depends: nativesdk-qemu-helper but
it is not installable
|                                    Depends: nativesdk-opkg but it is
not installable
|  packagegroup-cross-canadian-qt5022 : Depends:
gdb-cross-canadian-x86-64 but it is not installable
|                                       Depends:
binutils-cross-canadian-x86-64 but it is not installable
|                                       Depends:
gcc-cross-canadian-x86-64 but it is not installable
|                                       Depends: meta-environment-qt5022
but it is not installable

(From OE-Core rev: a3ccbdffc04d16ae56699314dbd7ee8b6de75267)

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 833feca882..b96c5efad0 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -6,6 +6,9 @@ DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "i386"]\
                 [d.getVar('SDK_ARCH', True) in \
                 ["x86", "i486", "i586", "i686", "pentium"]]}"
 
+DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "amd64"]\
+                [d.getVar('SDK_ARCH', True) == "x86_64"]}"
+
 do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
 
 # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called