aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-12-18 17:20:32 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-12-18 17:20:32 +0000
commit1e5a836412dbc372c81d37ac4c288857619ed1f6 (patch)
treed33f1d8eed4d591823d2ba86772a116fead3f60f /conf/distro
parent9aae17c427fc2842170f760b0a803665ccd205ea (diff)
parented2948f984ef1ea472362cd08fb08dc91f006da6 (diff)
downloadopenembedded-1e5a836412dbc372c81d37ac4c288857619ed1f6.tar.gz
merge of 'c1fd09a0b09739640d55402e3a267d14a39bfd80'
and 'f32bd285f81d67ffe77c826a1f15be44ccefdc3b'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf4
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc2
-rw-r--r--conf/distro/include/angstrom.inc2
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index a03cebf1ab..8eebee5f97 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,8 +7,8 @@
#@--------------------------------------------------------------------
# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC1.1"
-DISTRO_REVISION = "48"
+DISTRO_VERSION = "2007.11RC1.2"
+DISTRO_REVISION = "49"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index ddd9b61791..1b6ed46ac7 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1891,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u2nl ?= "1.3"
PREFERRED_VERSION_uae4all ?= "0.7.1"
PREFERRED_VERSION_ubahnnav ?= "0.4.1"
-PREFERRED_VERSION_u-boot-utils-native ?= "1.2.0"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 510a752211..313aca01f7 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -269,5 +269,5 @@ SEPPUKU_COMPONENT = "build"
# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"