summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-17 19:46:45 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-17 19:46:45 +0000
commitfc3bc03296b0a27f8aa0df65ba4d5ccd848447e3 (patch)
treee92bd244e205ea493dda27884c3b650c133bf651 /conf
parent4d14afc5b314478f0a19d75e5150f0501ce86e82 (diff)
parent2918fb5bef7b987a166cc6743c09ab35b8e321a0 (diff)
merge of '4f3ceea2e479c0f56f4f87cb516cab45429d0856'
and 'ccdb554f27d940b07a6e6b9686617b0aa58f3374'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf2
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 954f4b5e9c..a03cebf1ab 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,7 +7,7 @@
#@--------------------------------------------------------------------
# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC1"
+DISTRO_VERSION = "2007.11RC1.1"
DISTRO_REVISION = "48"
require conf/distro/include/sane-srcdates.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"