[oe-commits] org.oe.dev wifistix-module : Clean up bb file, add configuration file.

[crofton commit]

wifistix-module : Clean up bb file, add configuration file.

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: a0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9
ViewMTN: http://monotone.openembedded.org/revision/info/a0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9
Files:
1
packages/wifistix/wifistix-modules/wifistix.conf
packages/wifistix/wifistix-modules_5.0.16.p0.bb
Diffs:

#
# mt diff -r7b3eb3f553b8888f88b87b06f87fe00039a43031 -ra0d6cd0bb1fc7d9eba19c1ed2eb1b84f6eb001c9
#
# 
# 
# add_file "packages/wifistix/wifistix-modules/wifistix.conf"
#  content [4f54c69eb79183559844c1a626d6423719ac141f]
# 
# patch "packages/wifistix/wifistix-modules_5.0.16.p0.bb"
#  from [535b62f61c51533c64150e1f87508b01aca14e7e]
#    to [1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11]
# 
============================================================
--- packages/wifistix/wifistix-modules/wifistix.conf	4f54c69eb79183559844c1a626d6423719ac141f
+++ packages/wifistix/wifistix-modules/wifistix.conf	4f54c69eb79183559844c1a626d6423719ac141f
@@ -0,0 +1,4 @@
+install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
+
+alias mwlan0 mcf25
+
============================================================
--- packages/wifistix/wifistix-modules_5.0.16.p0.bb	535b62f61c51533c64150e1f87508b01aca14e7e
+++ packages/wifistix/wifistix-modules_5.0.16.p0.bb	1cc3c7cd23d0d7b0c59ba5d938b92f448c360c11
@@ -8,6 +8,7 @@ SRC_URI = "http://files.gumstix.com/cf83
 PR = "r0"
 
 SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
+			file://wifistix.conf \
 			file://marvell-devicename.patch;patch=1 \
 			file://marvell-devicetable.patch;patch=1 \
 			file://marvell-gumstix.patch;patch=1 \
@@ -24,21 +25,26 @@ inherit module-base
 
 inherit module-base
 
+EXTRA_OEMAKE = "CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
+                KERNELDIR=${KERNEL_SOURCE} ARCH=${TARGET_ARCH} \
+                CC=${KERNEL_CC} EXTRA_CFLAGS=${CFLAGS} \
+                INSTALL_MOD_PATH="${D}"
+
 do_compile() {	
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	make CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 KERNELDIR="${KERNEL_SOURCE}" \
-		ARCH="${TARGET_ARCH}" CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}"
+	oe_runmake
 }
 
 do_install() {	
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	make CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 KERNELDIR="${KERNEL_SOURCE}" \
-		ARCH="${TARGET_ARCH}" CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" INSTALL_MOD_PATH="${D}" install
-#	(grep -q mcf25 ${D}/etc/modprobe.conf || \
-#	 echo -e 'alias mwlan0 mcf25\n' >> ${D}/etc/modprobe.conf)
-#	(grep -q mwlan0 ${D}/etc/network/interfaces || \
-#	 echo -e '\nauto mwlan0\niface mwlan0 inet dhcp\n	pre-up /sbin/iwconfig $$IFACE essid any txpower 100mW\n' >> $(TARGET_DIR)/etc/network/interfaces)
+	oe_runmake install
+
+	install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 ${WORKDIR}/wifistix.conf ${D}${sysconfdir}/modprobe.d/wifistix.conf
 }
 
 PACKAGES = "${PN}"
+FILES_${PN} = "${base_libdir}/modules/"
+FILES_${PN} += "${sysconfdir}/modprobe.d/"
+CONFFILES_${PN} = "${sysconfdir}/modprobe.d/wifistix.conf"
+
-FILES_${PN} = "/lib/modules/"