summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_deb.bbclass10
-rw-r--r--meta/classes/populate_sdk_deb.bbclass6
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
6 6
7IMAGE_PKGTYPE ?= "deb" 7IMAGE_PKGTYPE ?= "deb"
8 8
9# Map TARGET_ARCH to Debian's ideas about architectures
10DPKG_ARCH ?= "${TARGET_ARCH}" 9DPKG_ARCH ?= "${TARGET_ARCH}"
11DPKG_ARCH_x86 ?= "i386"
12DPKG_ARCH_i486 ?= "i386"
13DPKG_ARCH_i586 ?= "i386"
14DPKG_ARCH_i686 ?= "i386"
15DPKG_ARCH_pentium ?= "i386"
16 10
17PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs" 11PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs"
18 12
@@ -418,6 +412,10 @@ python () {
418 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) 412 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
419 bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d) 413 bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d)
420 bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d) 414 bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d)
415
416 # Map TARGET_ARCH to Debian's ideas about architectures
417 if bb.data.getVar('DPKG_ARCH', d, True) in ["x86", "i486", "i586", "i686", "pentium"]:
418 bb.data.setVar('DPKG_ARCH', 'i386', d)
421} 419}
422 420
423python do_package_write_deb () { 421python 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
2do_populate_sdk[recrdeptask] += "do_package_write_deb" 2do_populate_sdk[recrdeptask] += "do_package_write_deb"
3 3
4 4
5DEB_SDK_ARCH = "${@[bb.data.getVar('SDK_ARCH', d, 1), "i386"]\
6 [bb.data.getVar('SDK_ARCH', d, 1) in \
7 ["x86", "i486", "i586", "i686", "pentium"]]}"
8
5populate_sdk_post_deb () { 9populate_sdk_post_deb () {
6 10
7 local target_rootfs=$1 11 local target_rootfs=$1
@@ -37,7 +41,7 @@ fakeroot populate_sdk_deb () {
37 ## install nativesdk ## 41 ## install nativesdk ##
38 echo "Installing NATIVESDK packages" 42 echo "Installing NATIVESDK packages"
39 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" 43 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
40 export INSTALL_BASEARCH_DEB="${SDK_ARCH}" 44 export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
41 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" 45 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
42 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}" 46 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
43 export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" 47 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""