From: Ting Liu Date: Wed, 9 Jul 2014 06:43:21 +0000 (-0500) Subject: openssl: set preferred version to 1.0.1g X-Git-Tag: 2.1~534^2~125 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8443b0288c81073d9b9095c1d638e2673ae5f739;p=meta-freescale.git openssl: set preferred version to 1.0.1g Signed-off-by: Ting Liu --- diff --git a/meta-fsl-ppc/conf/machine/e500mc.inc b/meta-fsl-ppc/conf/machine/e500mc.inc index 2b06fd1d..f5b419d6 100644 --- a/meta-fsl-ppc/conf/machine/e500mc.inc +++ b/meta-fsl-ppc/conf/machine/e500mc.inc @@ -8,6 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc index cbdf3d95..23b5091d 100644 --- a/meta-fsl-ppc/conf/machine/e500v2.inc +++ b/meta-fsl-ppc/conf/machine/e500v2.inc @@ -6,6 +6,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/meta-fsl-ppc/conf/machine/e5500-64b.inc b/meta-fsl-ppc/conf/machine/e5500-64b.inc index c11c3c12..b34be91b 100644 --- a/meta-fsl-ppc/conf/machine/e5500-64b.inc +++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc @@ -9,6 +9,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/meta-fsl-ppc/conf/machine/e5500.inc b/meta-fsl-ppc/conf/machine/e5500.inc index db51aa86..0b4a9a3b 100644 --- a/meta-fsl-ppc/conf/machine/e5500.inc +++ b/meta-fsl-ppc/conf/machine/e5500.inc @@ -8,6 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/meta-fsl-ppc/conf/machine/e6500-64b.inc b/meta-fsl-ppc/conf/machine/e6500-64b.inc index 80251038..a37d1dd2 100644 --- a/meta-fsl-ppc/conf/machine/e6500-64b.inc +++ b/meta-fsl-ppc/conf/machine/e6500-64b.inc @@ -9,6 +9,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/meta-fsl-ppc/conf/machine/e6500.inc b/meta-fsl-ppc/conf/machine/e6500.inc index 4401eb67..dd259fc7 100644 --- a/meta-fsl-ppc/conf/machine/e6500.inc +++ b/meta-fsl-ppc/conf/machine/e6500.inc @@ -8,6 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules" PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_VERSION_qemu = "1.7+fsl" +PREFERRED_VERSION_openssl = "1.0.1g" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now