diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-02 00:51:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-02 00:51:34 +0000 |
| commit | e62c3d12f0ab466cdfa01a49fb86674969e7179d (patch) | |
| tree | 85bf98102e86950da1726f9ef04f09476fff9eac /conf | |
| parent | 471d4c7a1a8d509f8bbd71b78fcdd0ab31427547 (diff) | |
| parent | fde83d7aabf6c0f8d56dbe1e1aba0783b004bab3 (diff) | |
propagate from branch 'org.openembedded.dev' (head 47c2f7f436790105a8af32ec352907b8ff53aba1)
to branch 'org.openembedded.nslu2-linux' (head a69b542d88fdbf378cd19a8ef701895615c143f7)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/ipaq-common.conf | 6 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 4 |
2 files changed, 7 insertions, 3 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 |