diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 13:17:16 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 13:26:57 +0300 |
| commit | 1c2e155111dce94423cc227ea69f7f50f316c78e (patch) | |
| tree | 7854e2c7440d31ecbb2193d0e0c38030e0192f8c | |
| parent | 4a621def8529c3a55c6fcaef72e3b1832a9327b3 (diff) | |
| parent | f5f676d9ee9f8e205363eace7a846a0360998634 (diff) | |
* qtyocto/upstream/morty:
f5f676d machine-sdk: Ensure SDK_DEPENDS doesn't contain nativesdk-glibc-locale
e0e5318 machine-sdk: disable locales in SDK
Change-Id: I265399774753a82c9f25aecbfe89733d064e891b
| -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" |