diff options
author | Mike Westerhof <mwester@dls.net> | 2007-03-09 00:08:41 +0000 |
---|---|---|
committer | Mike Westerhof <mwester@dls.net> | 2007-03-09 00:08:41 +0000 |
commit | 440232bab6b4900c21700003c33313fb44c9904f (patch) | |
tree | 05de04a069042a402b321463dea34d2913e36663 | |
parent | 3aeaac33bc061b342afc064800c00b1d49f3002a (diff) | |
parent | af9ed67a48371bce6bf02cc7dc191ac1ada9325e (diff) |
merge of '6ad5f744a0e10576da1d785da1a1f3f221137399'
and 'f8e828833a5832ebccfdf10c0fe7b45d343a8ba0'
-rw-r--r-- | conf/distro/include/slugos.inc | 5 | ||||
-rw-r--r-- | packages/meta/slugos-native.bb | 9 |
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 = "" |