conf/machine/include/: remove openswan, do distro stuff in conf/distro

diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index f8767d2..9ac43d8 100644 (file)
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -18,6 +18,6 @@ input uinput \
 
 # 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-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils  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 b2ca837..5c8fce4 100644 (file)
--- 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 keymaps irda-utils hostap-utils prism3-firmware prism3-support \
-wpa-supplicant-nossl ppp ppp-dialin openswan"
+wpa-supplicant-nossl ppp ppp-dialin "
 
 # 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 97030e6..8c91a7b 100644 (file)
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -8,7 +8,7 @@ PCMCIA_MANAGER ?= "pcmciautils"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
 ${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+ppp ppp-dialin  wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
 
 # Ethernet modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"