summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-06-08 08:32:16 +0000
committerKoen Kooi <koen@openembedded.org>2007-06-08 08:32:16 +0000
commit99080914085100da9cacf91243f0ead3b02abae8 (patch)
treed0806a6fd48a87ac5116f6e7fa404defb0dfebf1
parente2a93800d6958ce44b0c605f42ce1b04013f4463 (diff)
parent6e5b132accfc498a843b84477d1aee909068711c (diff)
merge of '2415386acd7ccac3f0f71353ad8ac290a875573d'
and '4cd70362c1066d1d95aea3f4308c3007d06592ce'
-rw-r--r--conf/distro/angstrom-2007.1.conf3
-rw-r--r--packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb (renamed from packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb)0
-rw-r--r--packages/qpf-fonts/qpf-bitstream-vera_1.10.bb (renamed from packages/vera-fonts/qpf-bitstream-vera_1.10.bb)0
-rw-r--r--packages/ttf-fonts/ttf-bitstream-vera_1.10.bb (renamed from packages/vera-fonts/ttf-bitstream-vera_1.10.bb)0
-rw-r--r--packages/vera-fonts/.mtn2git_empty0
5 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 9391dd342b..a9e9e0dbd8 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -295,11 +295,12 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
# add altboot to compatible models, will be replaced with angstrom-bootmanager
+#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
#EXTRA_STUFF_append_c7x0 += "altboot"
#EXTRA_STUFF_append_akita += "altboot"
-#EXTRA_STUFF_append_spitz += "altboot"
#EXTRA_STUFF_append_poodle += "altboot"
#EXTRA_STUFF_append_tosa += "altboot"
+EXTRA_STUFF_append_spitz += "altboot"
# do some task-base stuff here
diff --git a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 10d2d4acdd..10d2d4acdd 100644
--- a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
diff --git a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
index 86f2ef9446..86f2ef9446 100644
--- a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
+++ b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb
diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
index 871bc1d37c..871bc1d37c 100644
--- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/ttf-fonts/ttf-bitstream-vera_1.10.bb
diff --git a/packages/vera-fonts/.mtn2git_empty b/packages/vera-fonts/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/vera-fonts/.mtn2git_empty
+++ /dev/null