[oe-commits] org.oe.dev merge of '8c692ec4078a7d2e345213289da925bfca3cac63'

[xora commit]

merge of '8c692ec4078a7d2e345213289da925bfca3cac63'
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a1dfdac15b4a615ff22cad20ebbf724bcf12fa04
ViewMTN: http://monotone.openembedded.org/revision/info/a1dfdac15b4a615ff22cad20ebbf724bcf12fa04
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r8c692ec4078a7d2e345213289da925bfca3cac63 -ra1dfdac15b4a615ff22cad20ebbf724bcf12fa04
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [2fd8530be37218a5cbf35df8dc71e053e5a2e088]
#    to [0f1c46770dd8bc83dea22c584f64a2519be26f18]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	2fd8530be37218a5cbf35df8dc71e053e5a2e088
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	0f1c46770dd8bc83dea22c584f64a2519be26f18
@@ -776,7 +776,7 @@ PREFERRED_VERSION_kf ?= "0.5.4.1"
 PREFERRED_VERSION_keymaps ?= "1.0"
 PREFERRED_VERSION_keyring ?= "0.6.8"
 PREFERRED_VERSION_kf ?= "0.5.4.1"
-PREFERRED_VERSION_kismet ?= "2007-01-R1b"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
 PREFERRED_VERSION_klibc ?= "1.1.1"
 PREFERRED_VERSION_klimt ?= "0.6.1"
 PREFERRED_VERSION_knights ?= "1.14"


#
# mt diff -rbee606bba2fcf2659a8e2c29fbbc9d904f84962c -ra1dfdac15b4a615ff22cad20ebbf724bcf12fa04
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [0333915fd642b2db9af96929a6b9fd60df4292bc]
#    to [0556daa097782b542ec3ef3bc2bc525d58b78091]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [1ea5dcfd838edd17ffbc00d7af4de7866da4c071]
#    to [2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	0333915fd642b2db9af96929a6b9fd60df4292bc
+++ conf/distro/angstrom-2007.1.conf	0556daa097782b542ec3ef3bc2bc525d58b78091
@@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/xserver      
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
============================================================
--- conf/distro/angstrom-2008.1.conf	1ea5dcfd838edd17ffbc00d7af4de7866da4c071
+++ conf/distro/angstrom-2008.1.conf	2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126
@@ -103,6 +103,7 @@ require conf/distro/include/preferred-xo
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/xserver      
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"