[oe-commits] org.oe.dev merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'

[hrw commit]

merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'
     and 'ab14a7f33b13f2205a64293e2f2e29b20e943bf3'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: dc7318b35dd6cc95503b1d9848da50570ff6899a
ViewMTN: http://monotone.openembedded.org/revision/info/dc7318b35dd6cc95503b1d9848da50570ff6899a
Files:
1
packages/cryptsetup
packages/cryptsetup/cryptsetup_1.0.5.bb
packages/wifistix/wifistix-modules/mcf25
packages/wifistix/wifistix-modules/wifistix.conf
packages/wifistix/wifistix-modules_5.0.16.p0.bb
packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
Diffs:

#
# mt diff -r479b064df21386e3f77f93516e86f40c7ea9ccfa -rdc7318b35dd6cc95503b1d9848da50570ff6899a
#
# 
# 
# add_dir "packages/cryptsetup"
# 
# add_file "packages/cryptsetup/cryptsetup_1.0.5.bb"
#  content [2fc012114b380aa1a4c3f28a6b4d45b0124a0677]
# 
# add_file "packages/wifistix/wifistix-modules/mcf25"
#  content [4beb468fcb7f536bca60c6f26ed1ed18bcdea0c1]
# 
# patch "packages/wifistix/wifistix-modules/wifistix.conf"
#  from [8e05a5ef94bf024fba3186952cbf09c52e2b187f]
#    to [412a96f2e1352a9e466614bc84d28a76f4be1244]
# 
# patch "packages/wifistix/wifistix-modules_5.0.16.p0.bb"
#  from [1f6020f4a46c11c6f194b1f39764e362f282c95b]
#    to [34aedfdb060c53347e5e2fdf66b13156d868d911]
# 
============================================================
--- packages/cryptsetup/cryptsetup_1.0.5.bb	2fc012114b380aa1a4c3f28a6b4d45b0124a0677
+++ packages/cryptsetup/cryptsetup_1.0.5.bb	2fc012114b380aa1a4c3f28a6b4d45b0124a0677
@@ -0,0 +1,44 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at 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
+}
============================================================
--- packages/wifistix/wifistix-modules/mcf25	4beb468fcb7f536bca60c6f26ed1ed18bcdea0c1
+++ packages/wifistix/wifistix-modules/mcf25	4beb468fcb7f536bca60c6f26ed1ed18bcdea0c1
@@ -0,0 +1,2 @@
+mcf25
+
============================================================
--- packages/wifistix/wifistix-modules/wifistix.conf	8e05a5ef94bf024fba3186952cbf09c52e2b187f
+++ packages/wifistix/wifistix-modules/wifistix.conf	412a96f2e1352a9e466614bc84d28a76f4be1244
@@ -1,4 +1,4 @@
-install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
+alias wlan0 mcf25
 
-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
 
============================================================
--- packages/wifistix/wifistix-modules_5.0.16.p0.bb	1f6020f4a46c11c6f194b1f39764e362f282c95b
+++ packages/wifistix/wifistix-modules_5.0.16.p0.bb	34aedfdb060c53347e5e2fdf66b13156d868d911
@@ -9,12 +9,14 @@ SRC_URI = "http://files.gumstix.com/cf83
 
 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"
 


#
# mt diff -rab14a7f33b13f2205a64293e2f2e29b20e943bf3 -rdc7318b35dd6cc95503b1d9848da50570ff6899a
#
# 
# 
# patch "packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch"
#  from [be6a4b2aa961a49ffec3f9081246234b2804629e]
#    to [813ab0fd454ea252d7f4e2434e7a9e7a486e350f]
# 
# patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
#  from [4f3ab359bbe31bfb1b631b303c97ad63c2f981e3]
#    to [eaf518590d6acebdd35fcd19d1ce91cc2c6fc805]
# 
============================================================
--- packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch	be6a4b2aa961a49ffec3f9081246234b2804629e
+++ packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch	813ab0fd454ea252d7f4e2434e7a9e7a486e350f
@@ -37,7 +37,7 @@ Index: linux-wlan-ng-0.2.7/src/prism2/dr
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
 +void prism2sta_commsqual_defer(struct work_struct *work)
 +{
-+	hfa384x_t		*hw = container_of(work, hfa384x_t, usb_work);
++	hfa384x_t		*hw = container_of(work, hfa384x_t, commsqual_bh);
 +#else
  void prism2sta_commsqual_defer(void *data)
  {
============================================================
--- packages/wlan-ng/wlan-ng-modules_0.2.7.bb	4f3ab359bbe31bfb1b631b303c97ad63c2f981e3
+++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb	eaf518590d6acebdd35fcd19d1ce91cc2c6fc805
@@ -1,5 +1,7 @@ require wlan-ng-modules.inc
 require wlan-ng-modules.inc
 
+PR = "r1"
+
 SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
 	    file://2.6.22-fixes.patch;patch=1"