[oe-commits] Paul Eggleton : conf/distro: update distro Opie references to 1.2.5

[git version control]

Module: openembedded.git
Branch: master
Commit: e6a4e3f3020f1e074a783c8b7bed1e86443d8f16
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=e6a4e3f3020f1e074a783c8b7bed1e86443d8f16

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Sat Jun  4 14:20:49 2011 +0100

conf/distro: update distro Opie references to 1.2.5

Move all distro files still pointing to Opie 1.2.4 preferred versions
inc file to use the 1.2.5 one.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 conf/distro/jlime-2010.1.conf |    2 +-
 conf/distro/kaeilos-2010.conf |    2 +-
 conf/distro/kaeilos.conf      |    2 +-
 conf/distro/metano.conf       |    2 +-
 conf/distro/shr.conf          |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index a3ec20e..e3a0624 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -106,4 +106,4 @@ ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
 DISTRO_BLUETOOTH_MANAGER = "blueprobe bluez4"
 
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf
index 8575254..ddfa01c 100644
--- a/conf/distro/kaeilos-2010.conf
+++ b/conf/distro/kaeilos-2010.conf
@@ -20,7 +20,7 @@ OLDEST_KERNEL ?= "2.6.28"
 
 require conf/distro/include/kaeilos-2009-preferred-versions.inc
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 3903321..d2c9289 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -19,7 +19,7 @@ DISTRO_PR = ".7"
 OLDEST_KERNEL ?= "2.6.16"
 
 require conf/distro/include/kaeilos-2009-preferred-versions.inc
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
diff --git a/conf/distro/metano.conf b/conf/distro/metano.conf
index 3f4daac..5fd8bac 100644
--- a/conf/distro/metano.conf
+++ b/conf/distro/metano.conf
@@ -89,7 +89,7 @@ require conf/distro/include/arm-thumb.inc
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
 
 PREFERRED_PROVIDER_opkg ?= "opkg"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 54afd9f..1e5bb05 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -189,7 +189,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
 
 #############################################################################
 # CONTENTS