From 895260b5ef18e962cf6c6368a779fa416ef00048 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 6 Mar 2008 13:17:36 +0000
Subject: chinook-compat: use libgcrypt 1.4.0 like Maemo4 does

---
 conf/distro/chinook-compat.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index aee81f240f..a46ee49012 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -146,7 +146,7 @@ PREFERRED_VERSION_libsoup = "2.2.7"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
 PREFERRED_VERSION_libgpg-error = "1.4"
-PREFERRED_VERSION_libgcrypt = "1.2.3"
+PREFERRED_VERSION_libgcrypt = "1.4.0"
 
 PREFERRED_VERSION_gpe-scap = "1.3"
 
-- 
cgit 1.2.3-korg


From 27eec02c6a00e3bc978edd8afe432f7db97ba900 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 6 Mar 2008 13:20:51 +0000
Subject: 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.

---
 conf/distro/chinook-compat.conf                       | 6 +++---
 packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb      | 2 +-
 packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb | 2 +-
 packages/gcc/gcc_csl-arm-2005q3.bb                    | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index a46ee49012..e89d2185a7 100644
--- 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 1639511362..aff22fb694 100644
--- 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 4b7e7b715c..d9c818979c 100644
--- 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 4c8f8227a9..b90f6907bb 100644
--- 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"
-- 
cgit 1.2.3-korg