diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-02-18 14:08:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-19 13:56:09 +0000 |
| commit | 62a40d567f9940b5d2b36d934ea20e70e0b36535 (patch) | |
| tree | 40339c1c36a7d03f9b1267b8ba6c574525e95f3b | |
| parent | ef8df74449ec914c74482cef1e465fa42c1852f9 (diff) | |
intel: don't hardcode intel-corei7-64
meta-intel has separate machine config for intel-skylake-64.
Change intel-corei7-64 everywhere to work also with the skylake.
Change-Id: I4b8ef6a64c1845276aa4767b88aa444e400ef484
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fbecde5241efb95dd3be05c9b8fbfbb8476f29a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/include/no-gpl3.inc | 6 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb | 2 | ||||
| -rwxr-xr-x | scripts/setup-environment.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc index d6c8f32e..8f7fc497 100644 --- a/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc +++ b/meta-boot2qt-distro/conf/distro/include/no-gpl3.inc @@ -42,6 +42,6 @@ PACKAGECONFIG_remove_pn-qtvirtualkeyboard = "hunspell" PACKAGECONFIG_remove_pn-python3-pygobject = "cairo" # intel nuc specific changes -IMAGE_FSTYPES_intel-corei7-64 = "tar.gz" -MACHINE_EXTRA_INSTALL_remove_intel-corei7-64 = "grub-efi-config" -QBSP_IMAGE_CONTENT_intel-corei7-64 = "" +IMAGE_FSTYPES_intel-x86-common = "tar.gz" +MACHINE_EXTRA_INSTALL_remove_intel-x86-common = "grub-efi-config" +QBSP_IMAGE_CONTENT_intel-x86-common = "" diff --git a/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb b/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb index 63f4913e..60634663 100644 --- a/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb +++ b/meta-boot2qt/recipes-alexa/avs-device-sdk/avs-device-sdk_1.12.1.bb @@ -11,4 +11,4 @@ SRC_URI[sha256sum] = "fba17b343c011410584330d8e268d09f449d16d62007b1a797751721a5 # Enable OPUS by default PACKAGECONFIG += "opus portaudio" -PACKAGECONFIG_append_intel-corei7-64 = " kittai " +PACKAGECONFIG_append_intel-x86-common = " kittai " diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 31dfcc67..84816cc6 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -65,7 +65,7 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then raspberrypi*) LAYERSCONF="bblayers.conf.rpi.sample" ;; - intel-corei7-64) + intel-*) LAYERSCONF="bblayers.conf.intel.sample" ;; jetson-*) |