diff options
| -rw-r--r-- | classes/cross.bbclass | 1 | ||||
| -rw-r--r-- | classes/insane.bbclass | 17 | ||||
| -rw-r--r-- | classes/native.bbclass | 2 | ||||
| -rw-r--r-- | classes/sdk.bbclass | 1 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 8 | ||||
| -rw-r--r-- | conf/bitbake.conf | 6 |
6 files changed, 28 insertions, 7 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 9dddca127a..7debde6669 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -16,6 +16,7 @@ HOST_VENDOR = "${BUILD_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +HOST_EXEEXT = "${BUILD_EXEEXT}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 6bcaa22e04..3a2cadcaff 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -289,8 +289,9 @@ def package_qa_check_arch(path,name,d, elf): target_arch = bb.data.getVar('TARGET_ARCH', d, True) # FIXME: Cross package confuse this check, so just skip them - if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): - return True + for s in ['cross', 'sdk', 'canadian-cross', 'canadian-sdk']: + if bb.data.inherits_class(s, d): + return True # avoid following links to /usr/bin (e.g. on udev builds) # we will check the files pointed to anyway... @@ -381,10 +382,12 @@ def package_qa_check_staged(path,d): workdir = os.path.join(tmpdir, "work") installed = "installed=yes" - if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): - pkgconfigcheck = workdir - else: - pkgconfigcheck = tmpdir + iscrossnative = False + pkgconfigcheck = tmpdir + for s in ['cross', 'native', 'canadian-cross', 'canadian-native']: + if bb.data.inherits_class(s, d): + pkgconfigcheck = workdir + iscrossnative = True # find all .la and .pc files # read the content @@ -395,7 +398,7 @@ def package_qa_check_staged(path,d): if file[-2:] == "la": file_content = open(path).read() # Don't check installed status for native/cross packages - if not bb.data.inherits_class("native", d) and not bb.data.inherits_class("cross", d): + if not iscrossnative: if installed in file_content: error_msg = "%s failed sanity test (installed) in path %s" % (file,root) sane = package_qa_handle_error(5, error_msg, "staging", path, d) diff --git a/classes/native.bbclass b/classes/native.bbclass index 61048b6b14..4f3856ccf5 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -18,12 +18,14 @@ TARGET_OS = "${BUILD_OS}" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_PREFIX = "${BUILD_PREFIX}" TARGET_CC_ARCH = "${BUILD_CC_ARCH}" +TARGET_EXEEXT = "${BUILD_EXEEXT}" HOST_ARCH = "${BUILD_ARCH}" HOST_OS = "${BUILD_OS}" HOST_VENDOR = "${BUILD_VENDOR}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +HOST_EXEEXT = "${BUILD_EXEEXT}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index 6c66eac7ad..da6cab9cd5 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -20,6 +20,7 @@ HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" #HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" +HOST_EXEEXT = "${BUILD_EXEEXT}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index ee4e4b3299..55ab371af3 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -40,6 +40,14 @@ def get_siteinfo_list(d): "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i686-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ + "i386-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i486-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i586-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i686-cygwin": "endian-little bit-32 common-cygwin ix86-common",\ + "i386-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ + "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ "mips-linux": "endian-big bit-32 common-linux common-glibc",\ diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 87081739fb..3646522d93 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -71,6 +71,7 @@ BUILD_VENDOR = "" BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" BUILD_PREFIX = "" BUILD_CC_ARCH = "" +BUILD_EXEEXT = "" HOST_ARCH = "${TARGET_ARCH}" HOST_OS = "${TARGET_OS}" @@ -78,6 +79,7 @@ HOST_VENDOR = "${TARGET_VENDOR}" HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" +HOST_EXEEXT = "" TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" @@ -85,6 +87,10 @@ TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" +TARGET_EXEEXT = "" + +# A shortcut for the commonly used value +EXEEXT = "${HOST_EXEEXT}" BASE_PACKAGE_ARCH = "${HOST_ARCH}" PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" |