diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-29 18:11:18 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:14 -0300 |
commit | ca37332938accb840b120648ba7434dbead7b464 (patch) | |
tree | 5defc488f8f130ed866fce97bf884ca290282a13 /conf/machine | |
parent | 5d7917902628b84919ac9dfc332fd46a4d579e60 (diff) | |
download | meta-freescale-ca37332938accb840b120648ba7434dbead7b464.tar.gz |
openssl: Avoid contamination OE-Core recipe
The QorIQ version of openssl needs to use another recipe name and have
a common provider, which is than choosen for QorIQ-based machines.
The recipe is now called 'openssl-qoriq' and it provides openssl so
the preferrence is set just for QorIQ based machines.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/include/qoriq-arm.inc | 1 | ||||
-rw-r--r-- | conf/machine/include/qoriq-base.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index ba6345cf..f93a0b21 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc | |||
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel_ls102xa ?= "linux-ls1" | |||
7 | PREFERRED_PROVIDER_cryptodev_ls102xa = "cryptodev-qoriq" | 7 | PREFERRED_PROVIDER_cryptodev_ls102xa = "cryptodev-qoriq" |
8 | PREFERRED_PROVIDER_cryptodev-module_ls102xa = "cryptodev-qoriq-module" | 8 | PREFERRED_PROVIDER_cryptodev-module_ls102xa = "cryptodev-qoriq-module" |
9 | PREFERRED_PROVIDER_cryptodev-tests_ls102xa = "cryptodev-qoriq-tests" | 9 | PREFERRED_PROVIDER_cryptodev-tests_ls102xa = "cryptodev-qoriq-tests" |
10 | PREFERRED_PROVIDER_openssl_ls102xa = "openssl-qoriq" | ||
10 | 11 | ||
11 | # Define the default image type | 12 | # Define the default image type |
12 | IMAGE_CLASSES ?= "image_types_uboot" | 13 | IMAGE_CLASSES ?= "image_types_uboot" |
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index e5949fa4..a89f4d51 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc | |||
@@ -7,10 +7,10 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" | |||
7 | PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq" | 7 | PREFERRED_PROVIDER_cryptodev = "cryptodev-qoriq" |
8 | PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" | 8 | PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" |
9 | PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" | 9 | PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" |
10 | PREFERRED_PROVIDER_openssl = "openssl-qoriq" | ||
10 | 11 | ||
11 | # versions | 12 | # versions |
12 | PREFERRED_VERSION_qemu = "2.2.0+fsl" | 13 | PREFERRED_VERSION_qemu = "2.2.0+fsl" |
13 | PREFERRED_VERSION_openssl = "1.0.1i" | ||
14 | 14 | ||
15 | # settings | 15 | # settings |
16 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | 16 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |