diff options
| -rw-r--r-- | meta/classes/package_deb.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 87e20da843..5a32047322 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -6,13 +6,7 @@ inherit package IMAGE_PKGTYPE ?= "deb" -# Map TARGET_ARCH to Debian's ideas about architectures DPKG_ARCH ?= "${TARGET_ARCH}" -DPKG_ARCH_x86 ?= "i386" -DPKG_ARCH_i486 ?= "i386" -DPKG_ARCH_i586 ?= "i386" -DPKG_ARCH_i686 ?= "i386" -DPKG_ARCH_pentium ?= "i386" PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs" @@ -418,6 +412,10 @@ python () { bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d) bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d) + + # Map TARGET_ARCH to Debian's ideas about architectures + if bb.data.getVar('DPKG_ARCH', d, True) in ["x86", "i486", "i586", "i686", "pentium"]: + bb.data.setVar('DPKG_ARCH', 'i386', d) } python do_package_write_deb () { diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index 40516b856c..2cff69e827 100644 --- a/meta/classes/populate_sdk_deb.bbclass +++ b/meta/classes/populate_sdk_deb.bbclass @@ -2,6 +2,10 @@ do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_popul do_populate_sdk[recrdeptask] += "do_package_write_deb" +DEB_SDK_ARCH = "${@[bb.data.getVar('SDK_ARCH', d, 1), "i386"]\ + [bb.data.getVar('SDK_ARCH', d, 1) in \ + ["x86", "i486", "i586", "i686", "pentium"]]}" + populate_sdk_post_deb () { local target_rootfs=$1 @@ -37,7 +41,7 @@ fakeroot populate_sdk_deb () { ## install nativesdk ## echo "Installing NATIVESDK packages" export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" - export INSTALL_BASEARCH_DEB="${SDK_ARCH}" + export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}" export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}" export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" |