diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-16 12:51:27 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-23 09:07:34 +0300 |
| commit | 2a5619ffdc0f02f57e0c36387fd25c8540c60a8a (patch) | |
| tree | b85d86171c5f4b35ee932a919612d02698f6b6bf | |
| parent | 27ccecd47b5e745d4c6a11708dd42a90cc235fb3 (diff) | |
| parent | c6db1934fc43fb06b93aff3e5634d89cc2b65b77 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/pyro' into pyropyro
* upstream/pyro:
c6db193 machine-sdk: Ensure SDK_DEPENDS doesn't contain nativesdk-glibc-locale
0cffc0d machine-sdk: disable locales in SDK
Change-Id: I6e0a3ad9fa172f8887c1eece5620243ffdc1b87e
| -rw-r--r-- | conf/machine-sdk/i686-mingw32.conf | 2 | ||||
| -rw-r--r-- | conf/machine-sdk/x86_64-mingw32.conf | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/machine-sdk/i686-mingw32.conf b/conf/machine-sdk/i686-mingw32.conf index d426fe3..458d1f7 100644 --- a/conf/machine-sdk/i686-mingw32.conf +++ b/conf/machine-sdk/i686-mingw32.conf @@ -21,6 +21,8 @@ SDK_PACKAGING_FUNC = "do_compile" #SDKTAROPTS_append = " -h --hard-dereference" SDKUSE_NLS = "no" +SDKIMAGE_LINGUAS = "" +SDK_DEPENDS_remove = "nativesdk-glibc-locale" SDKPKGSUFFIX = "nativesdk-mingw32" diff --git a/conf/machine-sdk/x86_64-mingw32.conf b/conf/machine-sdk/x86_64-mingw32.conf index b9706f9..61e6112 100644 --- a/conf/machine-sdk/x86_64-mingw32.conf +++ b/conf/machine-sdk/x86_64-mingw32.conf @@ -21,6 +21,8 @@ SDK_PACKAGING_FUNC = "do_compile" #SDKTAROPTS_append = " -h --hard-dereference" SDKUSE_NLS = "no" +SDKIMAGE_LINGUAS = "" +SDK_DEPENDS_remove = "nativesdk-glibc-locale" SDKPKGSUFFIX = "nativesdk-mingw32" |