merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'

     and 'ab14a7f33b13f2205a64293e2f2e29b20e943bf3'

5 files changed, 54 insertions, 2 deletions

diff --git a/packages/cryptsetup/.mtn2git_empty b/packages/cryptsetup/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cryptsetup/.mtn2git_empty
diff --git a/packages/cryptsetup/cryptsetup_1.0.5.bb b/packages/cryptsetup/cryptsetup_1.0.5.bb
new file mode 100644
index 0000000000..38da5cb155
--- /dev/null
+++ b/packages/cryptsetup/cryptsetup_1.0.5.bb
@@ -0,0 +1,44 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: cryptsetup_1.0.5.bb
+# Date: 20071120 (YMD)
+
+DESCRIPTION = "cryptsetup with luks support creates and manages encrypted containers and partitions"
+SECTION = "console"
+LICENSE = "GPL"
+HOMEPAGE = "http://luks.endorphin.org/"
+DEPENDS = "e2fsprogs-libs device-mapper"
+
+RRECOMMENDS = "kernel-module-aes \
+	       kernel-module-dm-crypt \
+	       kernel-module-md5 \
+	       kernel-module-cbc \
+	      "
+	     
+######################################################################################
+
+PR = "r0"
+
+######################################################################################
+
+inherit autotools 
+
+######################################################################################
+
+SRC_URI = "http://luks.endorphin.org/source/cryptsetup-${PV}.tar.bz2"
+
+######################################################################################
+
+pkg_postinst() {
+	if test "x$D" = "x"
+	then 
+		# Work around a problem in module ipk's, where depmod is not always
+		# run after installing a kernel-module.
+		test -x /sbin/depmod && /sbin/depmod -a
+		/bin/true
+	fi
+}
diff --git a/packages/wifistix/wifistix-modules/mcf25 b/packages/wifistix/wifistix-modules/mcf25
new file mode 100644
index 0000000000..b0d5a7ef21
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/mcf25
@@ -0,0 +1,2 @@
+mcf25
+
diff --git a/packages/wifistix/wifistix-modules/wifistix.conf b/packages/wifistix/wifistix-modules/wifistix.conf
index 117d8a2281..7554d4b19f 100644
--- a/packages/wifistix/wifistix-modules/wifistix.conf
+++ b/packages/wifistix/wifistix-modules/wifistix.conf
@@ -1,4 +1,4 @@
-install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
-
 alias wlan0 mcf25
 
+install cfio /sbin/modprobe proc-gpio && echo GPIO out set > /proc/gpio/GPIO80 && /sbin/pccardctl eject && /sbin/modprobe --ignore-install cfio && /sbin/pccardctl insert && modprobe pxa2xx-cs
+
diff --git a/packages/wifistix/wifistix-modules_5.0.16.p0.bb b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
index 923f24e27a..787c631d16 100644
--- a/packages/wifistix/wifistix-modules_5.0.16.p0.bb
+++ b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
@@ -9,12 +9,14 @@ PR = "r0"
 
 SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
 			file://wifistix.conf \
+			file://mcf25 \
 			file://marvell-devicename.patch;patch=1 \
 			file://marvell-devicetable.patch;patch=1 \
 			file://marvell-gumstix.patch;patch=1 \
 			file://sbi-no-inline.patch;patch=1 \
 			file://2.6.17-new-pcmcia-layer.patch;patch=1 \
 			file://bad-cast.patch;patch=1 \
+			file://sk_buff.patch;patch=1 \
 			file://struct-changes.patch;patch=1 \
 			file://no-more-config-h.patch;patch=1 \
 			file://realtime-kernel.patch;patch=1 \
@@ -41,10 +43,14 @@ do_install() {
 
 	install -m 0755 -d ${D}${sysconfdir}/modprobe.d
 	install -m 0644 ${WORKDIR}/wifistix.conf ${D}${sysconfdir}/modprobe.d/wifistix.conf
+ 	install -m 0755 -d ${D}${sysconfdir}/modutils
+ 	install -m 0644 ${WORKDIR}/mcf25 ${D}${sysconfdir}/modutils/mcf25
 }
 
 PACKAGES = "${PN}"
 FILES_${PN} = "${base_libdir}/modules/"
 FILES_${PN} += "${sysconfdir}/modprobe.d/"
+FILES_${PN} += "${sysconfdir}/modutils/"
 CONFFILES_${PN} = "${sysconfdir}/modprobe.d/wifistix.conf"
+CONFFILES_${PN} += "${sysconfdir}/modutils/mcf25"