diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/familiar-0.8.3.conf | 4 | ||||
| -rw-r--r-- | conf/machine/handheld-common.conf | 6 | ||||
| -rw-r--r-- | conf/machine/ipaq-common.conf | 6 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 5d19ca02be..53614d9291 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -4,7 +4,7 @@ DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}" include conf/distro/familiar.conf -#"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" +"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" @@ -52,7 +52,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" -#include conf/distro/preferred-gpe-versions-2.7.inc +include conf/distro/preferred-gpe-versions-2.7.inc # # E diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf index a014c2be65..dab1d01e70 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/handheld-common.conf @@ -17,8 +17,8 @@ input uinput \ " # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts" -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" +BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf index 95ac3d73f6..791abd2103 100644 --- a/conf/machine/ipaq-common.conf +++ b/conf/machine/ipaq-common.conf @@ -1,8 +1,8 @@ -IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" +IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" -BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules" +BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver" BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6" -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs ${@linux_module_packages('${IPAQ_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index d8432702c2..626b5cf218 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -30,9 +30,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" GPE_EXTRA_INSTALL += "gaim" -GPE_EXTRA_DEPENDS += " nano less gdb strace avahi-daemon zeroconf" -GPE_EXTRA_INSTALL += " nano less gdb strace avahi-daemon zeroconf" - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf |