chinook-compat, gcc-csl: make 3.4.4-csl-2005q3 have other PV for chinook-compat distro

It is required to have compatibility for C++ applications as Maemo has other
PV then OpenEmbedded use.

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index a46ee4901222a9e8ed688c1a2a15c66b3ebe3001..e89d2185a7908a6ce58f19340584a011268231d1 100644 (file)
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -59,9 +59,9 @@ PREFERRED_VERSION_automake-native = "1.9.6"
 PREFERRED_VERSION_binutils = "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross    = "2.18"
 
-PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
 
 # Use recent enough version of the headers to let HAL build successfully.
 PREFERRED_VERSION_linux-libc-headers = "2.6.20"

diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 16395113625a1126e4fa3d12ef66aa4d18cc6ac1..aff22fb69411334842b2f20b0adfe897aa7eb10c 100644 (file)
--- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,2 +1,2 @@
-require gcc-cross_${PV}.bb
+require gcc-cross_csl-arm-2005q3.bb
 require gcc-cross-initial.inc

diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index 4b7e7b715cba5959c89d5244e859b61c41109472..d9c818979c701d1e23b1d0603a70eb2eeb6bcf84 100644 (file)
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -7,7 +7,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-require gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_csl-arm-2005q3.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 

diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 4c8f8227a98e1334aceee3a0f51db50eab4377f9..b90f6907bbdf495c1a6426524b89093f1bb5b901 100644 (file)
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -4,6 +4,7 @@ SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
+PV_chinook-compat = "3.4.4cs2005q3.2"
 PR = "r3"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"