summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass8
-rw-r--r--meta/classes/cross-canadian.bbclass14
-rw-r--r--meta/classes/sstate.bbclass4
-rw-r--r--meta/conf/bitbake.conf9
4 files changed, 12 insertions, 23 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f390f0804f..0bea639a95 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -362,11 +362,8 @@ python () {
362 if local.startswith(mp): 362 if local.startswith(mp):
363 #bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch)) 363 #bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch))
364 bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d) 364 bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
365 bb.data.setVar('MULTIMACH_ARCH', mach_arch, d)
366 return 365 return
367 366
368 multiarch = pkg_arch
369
370 packages = bb.data.getVar('PACKAGES', d, 1).split() 367 packages = bb.data.getVar('PACKAGES', d, 1).split()
371 for pkg in packages: 368 for pkg in packages:
372 pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) 369 pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1)
@@ -375,10 +372,7 @@ python () {
375 # if multiple differences are present? 372 # if multiple differences are present?
376 # Look through PACKAGE_ARCHS for the priority order? 373 # Look through PACKAGE_ARCHS for the priority order?
377 if pkgarch and pkgarch == mach_arch: 374 if pkgarch and pkgarch == mach_arch:
378 multiarch = mach_arch 375 bb.fatal("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?" % d.getVar("PN", True))
379 break
380
381 bb.data.setVar('MULTIMACH_ARCH', multiarch, d)
382} 376}
383 377
384def check_gcc3(data): 378def check_gcc3(data):
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 1a045ba16d..edd51da87b 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -9,14 +9,14 @@
9# or indirectly via dependency. No need to be in 'world'. 9# or indirectly via dependency. No need to be in 'world'.
10EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
11 11
12STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 12STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
13 13
14# 14#
15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS 15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
16# 16#
17OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" 17OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
18OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}" 18OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
19OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} 19OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
20BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" 20BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
21python () { 21python () {
22 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() 22 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
@@ -25,7 +25,7 @@ python () {
25 sdkarchs.append(arch + '-nativesdk') 25 sdkarchs.append(arch + '-nativesdk')
26 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) 26 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
27} 27}
28MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" 28MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
29 29
30INHIBIT_DEFAULT_DEPS = "1" 30INHIBIT_DEFAULT_DEPS = "1"
31 31
@@ -66,12 +66,12 @@ target_exec_prefix := "${exec_prefix}"
66base_prefix = "${SDKPATHNATIVE}" 66base_prefix = "${SDKPATHNATIVE}"
67prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" 67prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
68exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" 68exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
69bindir = "${exec_prefix}/bin/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 69bindir = "${exec_prefix}/bin/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
70sbindir = "${bindir}" 70sbindir = "${bindir}"
71base_bindir = "${bindir}" 71base_bindir = "${bindir}"
72base_sbindir = "${bindir}" 72base_sbindir = "${bindir}"
73libdir = "${exec_prefix}/lib/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 73libdir = "${exec_prefix}/lib/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
74libexecdir = "${exec_prefix}/libexec/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 74libexecdir = "${exec_prefix}/libexec/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
75 75
76FILES_${PN} = "${prefix}" 76FILES_${PN} = "${prefix}"
77FILES_${PN}-dbg += "${prefix}/.debug \ 77FILES_${PN}-dbg += "${prefix}/.debug \
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6358d39431..14c90ecdeb 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -5,8 +5,8 @@ SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
5SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}" 5SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
6 6
7 7
8SSTATE_PKGARCH = "${MULTIMACH_ARCH}" 8SSTATE_PKGARCH = "${PACKAGE_ARCH}"
9SSTATE_PKGSPEC = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-" 9SSTATE_PKGSPEC = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
10SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}" 10SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
11SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" 11SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
12 12
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6d8a674d6c..ff2a912a47 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -99,9 +99,8 @@ PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
99# since machine specific packages are handled using multimachine 99# since machine specific packages are handled using multimachine
100PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH" 100PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
101 101
102MULTIMACH_ARCH = "${PACKAGE_ARCH}" 102MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
103MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 103MULTIMACH_HOST_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
104MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
105BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" 104BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
106BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 105BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
107 106
@@ -317,8 +316,6 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
317STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 316STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
318STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" 317STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
319 318
320# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
321# specific packages - hack around it for now.
322STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}" 319STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}"
323STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}" 320STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
324STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}" 321STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
@@ -329,8 +326,6 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
329STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 326STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
330STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 327STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
331 328
332# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
333# specific packages - hack around it for now.
334STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}" 329STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}"
335STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap" 330STAGING_DIR_TCBOOTSTRAP = "${STAGING_DIR_TARGET}-tcbootstrap"
336 331