Merge bk://openembedded@openembedded.bkbits.net/packages

into dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/03 19:55:50+01:00 nexus.co.uk!pb
move some module recommends from simpad.conf to handheld-common.conf; add pcnet_cs

BKrev: 40e70154RAlWmqYxCy5H8y5eWRahpw

diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
index e69de29..aa7c5c5 100644 (file)
--- a/conf/handheld-common.conf
+++ b/conf/handheld-common.conf
@@ -0,0 +1,4 @@
+# Configuration bits for "generic handheld"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep kernel-module-pcnet+cs"

diff --git a/conf/simpad.conf b/conf/simpad.conf
index 046d09c..1d5822c 100644 (file)
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep atmelwlandriver"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 INHERIT += "simpad_flashimg"