diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/ipaq-common.conf | 6 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 4 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 14 |
3 files changed, 15 insertions, 9 deletions
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf index 24a1e202f1..791abd2103 100644 --- a/conf/machine/ipaq-common.conf +++ b/conf/machine/ipaq-common.conf @@ -1,7 +1,9 @@ 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 mipv6 atmelwlandriver" -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" +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 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 567cee8ba1..fc61ba4f6a 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the IBM Netvista thin client TARGET_ARCH = "i386" -IPKG_ARCHS = "all i386 ${MACHINE}" +IPKG_ARCHS = "all i386" PREFERRED_PROVIDER_xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace" @@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe" PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" IMAGE_FSTYPE = "ext2" GUI_MACHINE_CLASS = "bigscreen" +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace" #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 7a39104c63..c928093855 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,10 +11,8 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -include conf/machine/handheld-common.conf +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-arm926ejs.conf @@ -32,10 +30,10 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules @@ -56,3 +54,7 @@ pcmcia-cs apm ppp wireless-tools console-tools" #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ # kernel-module-g-ether" +include conf/machine/handheld-common.conf + + + |