diff options
| author | Rene Wagner <rw@handhelds.org> | 2006-03-12 18:07:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-12 18:07:38 +0000 |
| commit | 8f292eb3959239337df2a3671ac9d71809c26982 (patch) | |
| tree | 0d89a3ea43db3376cb072d116aba552ded079d64 /conf/machine/include | |
| parent | b5daee486e0390421eec65d8331f7617b5b6edea (diff) | |
wpa-supplicant, gnutls, libgcrypt, various .confs: revert recent commits by jnc.
- reverts revisions:
53e14a99825447107bfefacf77e28b5718be54b8
b0535ae5d884f64c3f25212755c0dbbd607a4984
8aaa554502fb1d84fe29935d27089df09bfc3ea1
de47a33901a0f8666a237eaf5825ba25f364516f
- reasoning - please play by the rules
* we have a policy for commit messages
* don't silently drop patches (gnutls), whenever we patch stuff it's usually
done for a reason
* don't upgrade security critical packages (gnutls) to development releases.
upstream has a reason for not declaring them stable yet.
* when told by a senior developer to consult oe@ _before_ pushing a change
do so, don't ignore him (RP) and push anyway
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/handheld-common.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.4.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index 57afe89ce7..fbecc6e25c 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -20,6 +20,6 @@ PCMCIA_MANAGER ?= "pcmcia-cs" # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" +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/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index c8be696358..184258c8b6 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -11,7 +11,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant ppp ppp-dialin openswan" +wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index aa840586a6..d3882b7f65 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -2,10 +2,11 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" +ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" # Ethernet modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" |