summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-09 00:27:20 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-09 00:27:20 +0000
commitdcba1b2ebad1a65a5640164cb851c448ea637498 (patch)
tree00ad11371d789807e8556b8a96f4063b23fff079
parent573ffe08d8f08e9235d0c2ae0eb9ac86dcc22c51 (diff)
parent440232bab6b4900c21700003c33313fb44c9904f (diff)
merge of '75b7f0187937ff0cf23ec400350462b0cba2592b'
and 'd8a8e9bbd96a4458ef82b6a464d3f72deb83a546'
-rw-r--r--conf/distro/include/slugos.inc5
-rw-r--r--packages/meta/slugos-native.bb9
2 files changed, 11 insertions, 3 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index a89d193225..3edaa342cb 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -144,3 +144,8 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154"
#FIXME: HACK: REMOVE THIS
IGNORE_STRIP_ERRORS = ""
+
+# Due to upstream instability, and another OE project with conflicting
+# needs, nail down a specific, known-working version of madwifi-ng.
+# Remove this once the madwifi-ng stuff seems to stabilize once again.
+PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 3b4023ba45..281310a2dd 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -78,9 +78,12 @@ SLUGOS_NATIVE = "\
# even on a thumb system (and this can be set in the tool's .bb file),
# however even this doesn't work for very large programs at present
# (only monotone!)
-SLUGOS_NATIVE_THUMB_BROKEN = "\
- monotone-6 \
- "
+####### *-*-* TEMPORARY: mwester - remove monotone as it wont' build.
+#SLUGOS_NATIVE_THUMB_BROKEN = "\
+# monotone-6 \
+# "
+SLUGOS_NATIVE_THUMB_BROKEN = ""
+###### *-*-*
SLUGOS_NATIVE_THUMB_BROKEN_thumb = ""