diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-17 23:34:25 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-17 23:34:25 +0000 |
| commit | 0e08898f191b7a848c1f32d8d58513c47f16b6cb (patch) | |
| tree | f0ea771e9557994180b379826916a008b1268ac9 /conf | |
| parent | 082fac62e72d2e2e921c5a79631b9716709b28db (diff) | |
| parent | 3f84b6635b356488ee3a2bbad844bb02876a63a4 (diff) | |
merge of '5dc6982ea38f5357453c937c13cc8a341570c70e'
and 'b3b7b8bc7364554f922a7cbf7bab890c33ef0971'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/machine/cm-x270.conf | 2 |
3 files changed, 3 insertions, 3 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" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 2522897042..1b6188753e 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.23" +PREFERRED_VERSION_linux ?= "2.6.23" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" |