diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2008-03-06 13:56:08 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2008-03-06 13:56:08 +0000 |
| commit | 0229445e18a9e1fd717ad4a7d7ed25c24e768c87 (patch) | |
| tree | 55b63c51fb6373f70ae99e95e8e233297b211451 | |
| parent | 151938cb326f8b63dbd32d9663f35b36e3b482ae (diff) | |
| parent | 27eec02c6a00e3bc978edd8afe432f7db97ba900 (diff) | |
merge of '109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6'
and '5c8f022efd9bbafe6c82e1c11084eb5ea67334d9'
| -rw-r--r-- | conf/distro/chinook-compat.conf | 8 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc_csl-arm-2005q3.bb | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index aee81f240f..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" @@ -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" 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" |