diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-28 00:41:56 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-28 00:41:56 +0000 |
| commit | a3313ea1bcdc03d4a7b9bd785627b3cc99835721 (patch) | |
| tree | ef7d8502ce5c4a639fc52779581089e177cb0c45 /conf | |
| parent | 6256a3b966cd513c048f4b64df72c226b107858b (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/28 02:18:48+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/28 02:18:37+02:00 uni-frankfurt.de!mickeyl
fix qpe-vexed
2005/03/28 02:05:56+02:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/home/mickey/openembedded
2005/03/28 02:05:40+02:00 vanille.de!mickeyl
ship prism3 stuff in the clamshell images
2005/03/28 02:03:38+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/28 02:03:27+02:00 uni-frankfurt.de!mickeyl
fix stupid typo in preferred-opie-versions.inc
BKrev: 424752d48m38o6z1b39U7R_jBDkQOw
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 6 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index 2530f028ec..05f1e2ebd2 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/preferred-opie-versions.inc @@ -31,7 +31,7 @@ PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}" PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-checkbook = "${OPIE_CHECKBOOK}" +PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 31f1ed9398..3c0ee3fc0f 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -1,7 +1,9 @@ PREFERRED_PROVIDER_virtual/kernel = "c7x0-kernels-2.4-embedix" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ -hostap-modules orinoco-modules sharp-sdmmc-support chkhinge" +hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \ +hostap-utils prism3-firmware prism3-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor chkhinge" +kernel-module-usbdcore kernel-module-usbdmonitor chkhinge \ +hostap-utils prism3-firmware prism3-support" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index e408c5c86e..4cefec7af2 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -3,9 +3,11 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" PREFERRED_VERSION_orinoco-modules = "0.13e-26" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ -pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin" +pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \ +hostap-utils prism3-firmware prism3-support" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ -pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools" +pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools \ +hostap-utils prism3-firmware prism3-support" # NFS Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" |