summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Lapin <slapinid@gmail.com>2007-07-13 22:31:48 +0000
committerSergey Lapin <slapinid@gmail.com>2007-07-13 22:31:48 +0000
commitdf24ff00aa29c1c7cd671d85a06191d1657443ec (patch)
treec4b62bca9cf4ded03dda96173210536afa2d2445
parent32c2d4fb830df236bf889ff7562ba49a18a447ae (diff)
parentffdb5b0f12e2faf0e0fe9484dd4ccd42082731e7 (diff)
merge of '3f738271e74b011b3fc67c84d8222f5398d1f56f'
and 'd7d8f34cc9dafb7b0ee2ab018d07d6787541f161'
-rw-r--r--conf/distro/angstrom-2007.1.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 52a475f8f6..287fdd002d 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -98,6 +98,7 @@ PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
FEED_URIS += " \
no-arch##${ANGSTROM_URI}/unstable/feed/all \
@@ -160,7 +161,7 @@ PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
+PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
PREFERRED_VERSION_libxrandr ?= "1.2.1"
PREFERRED_VERSION_xrandr ?= "1.2.0"
PREFERRED_VERSION_randrproto ?= "1.2.1"
@@ -303,7 +304,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
#EXTRA_STUFF_append_akita += "altboot"
#EXTRA_STUFF_append_poodle += "altboot"
#EXTRA_STUFF_append_tosa += "altboot"
-EXTRA_STUFF_append_spitz += "altboot"
+#EXTRA_STUFF_append_spitz += "altboot"
# do some task-base stuff here