[oe-commits] org.oe.dev mdev: Add proper firmware loading support to mdev

[blaster8 commit]

mdev: Add proper firmware loading support to mdev
 * Patch contributed by Christian Hohnstaedt
 * mdev.conf updated to reflect change in firmware loading

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 39de275a038deb69d2bbd0167cd1c0e620ce5e02
ViewMTN: http://monotone.openembedded.org/revision.psp?id=39de275a038deb69d2bbd0167cd1c0e620ce5e02
Files:
1
packages/mdev/mdev-1.2.1/slugos/loadmicrocode.sh
packages/mdev/mdev-1.2.1/firmware
packages/mdev/mdev-1.2.1/mdevfirmware.patch
packages/mdev/mdev-1.2.1/slugos/mdev.conf
packages/mdev/mdev_1.2.1.bb
Diffs:

#
# mt diff -rf6d01778617020e6545faea3b4a89cecc3717a6a -r39de275a038deb69d2bbd0167cd1c0e620ce5e02
#
# 
# 
# delete "packages/mdev/mdev-1.2.1/slugos/loadmicrocode.sh"
# 
# add_file "packages/mdev/mdev-1.2.1/firmware"
#  content [e4122991c0a7084b2c3b3787b57006d746265311]
# 
# add_file "packages/mdev/mdev-1.2.1/mdevfirmware.patch"
#  content [2d25134bc10235fce5198e395b791ad921366d68]
# 
# patch "packages/mdev/mdev-1.2.1/slugos/mdev.conf"
#  from [426ec4e1c8d02371befae354a4ef1b860ce88667]
#    to [8fc915d84337a6b5c51e81751800313e8ee863c8]
# 
# patch "packages/mdev/mdev_1.2.1.bb"
#  from [31c8a6f5e5d8a7bbca05865742352c1024961150]
#    to [a447a0892b0c0767f20ca69d49f92fc0f052e6b8]
# 
============================================================
--- packages/mdev/mdev-1.2.1/firmware	e4122991c0a7084b2c3b3787b57006d746265311
+++ packages/mdev/mdev-1.2.1/firmware	e4122991c0a7084b2c3b3787b57006d746265311
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+firmwaredir=/lib/firmware
+
+if test "$SUBSYSTEM" = "firmware" -a "$ACTION" = "add"; then
+ if test -f $firmwaredir/$FIRMWARE; then
+   echo 1 > /sys/$DEVPATH/loading
+   cat $firmwaredir/$FIRMWARE > /sys/$DEVPATH/data
+   echo 0 > /sys/$DEVPATH/loading
+ else
+   echo -1 > /sys/$DEVPATH/loading
+ fi
+fi
+
============================================================
--- packages/mdev/mdev-1.2.1/mdevfirmware.patch	2d25134bc10235fce5198e395b791ad921366d68
+++ packages/mdev/mdev-1.2.1/mdevfirmware.patch	2d25134bc10235fce5198e395b791ad921366d68
@@ -0,0 +1,20 @@
+--- busybox-1.2.1/util-linux/mdev.c.orig	2006-07-01 00:42:13.000000000 +0200
++++ busybox-1.2.1/util-linux/mdev.c	2006-09-26 17:42:38.414162744 +0200
+@@ -255,7 +255,16 @@
+ 			bb_show_usage();
+ 
+ 		sprintf(temp, "/sys%s", env_path);
+-		if (!strcmp(action, "add")) make_device(temp,0);
++		if (!strcmp(action, "add")) {
++			struct stat st;
++			make_device(temp,0);
++			sprintf(temp, "/lib/mdev/%s", getenv("SUBSYSTEM"));
++			if (stat(temp, &st) == 0) {
++				if ((st.st_mode & S_IXUSR) && S_ISREG(st.st_mode)) {
++					system(temp);
++				}
++			}
++		}
+ 		else if (!strcmp(action, "remove")) make_device(temp,1);
+ 	}
+ 
============================================================
--- packages/mdev/mdev-1.2.1/slugos/mdev.conf	426ec4e1c8d02371befae354a4ef1b860ce88667
+++ packages/mdev/mdev-1.2.1/slugos/mdev.conf	8fc915d84337a6b5c51e81751800313e8ee863c8
@@ -9,4 +9,4 @@ event0 0:0 660 @ln -sf /dev/event0 /dev/
 tty 0:5 0660
 ttyS* 0:20 640
 event0 0:0 660 @ln -sf /dev/event0 /dev/buzzer
+ixp4xx_ucode root:root 600
-ixp4xx_ucode root:root 600 @/lib/mdev/loadmicrocode.sh
============================================================
--- packages/mdev/mdev_1.2.1.bb	31c8a6f5e5d8a7bbca05865742352c1024961150
+++ packages/mdev/mdev_1.2.1.bb	a447a0892b0c0767f20ca69d49f92fc0f052e6b8
@@ -1,25 +1,26 @@ LICENSE = "GPL"
 DESCRIPTION = "mdev is a small busybox utility for maintaining a   \
 dynamic /dev directory and is here packaged separately from        \
 busybox. This adds a very small extra overhead in rootfs size      \
 (approx 4kB) but allows greater flexibility."
 HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 S = ${WORKDIR}/busybox-${PV}
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://mdevdelnodes.patch;patch=1 \
-       file://defconfig \
+	   file://mdevfirmware.patch;patch=1 \
+           file://defconfig \
 	   file://mdev.sh \
 	   file://mdev.conf \
+	   file://firmware \
 	   "
-SRC_URI_append_slugos = "file://loadmicrocode.sh"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
-FILES_${PN} = "${sysconfdir}/init.d/mdev.sh ${sysconfdir}/mdev.conf ${base_sbindir}/mdev ${base_libdir}/mdev/loadmicrocode.sh"
+FILES_${PN} = "${sysconfdir}/init.d/mdev.sh ${sysconfdir}/mdev.conf ${base_sbindir}/mdev ${base_libdir}/mdev/firmware"
 
 INITSCRIPT_PACKAGES = "${PN}"
 INITSCRIPT_NAME_${PN} = "mdev.sh"
@@ -56,5 +57,5 @@ do_install () {
 	install -m 0755 ${WORKDIR}/mdev.sh ${D}${sysconfdir}/init.d/
 	
 	install -d ${D}${base_libdir}/mdev
-	install -m 0755 ${WORKDIR}/loadmicrocode.sh ${D}${base_libdir}/mdev/loadmicrocode.sh
+	install -m 0755 ${WORKDIR}/firmware ${D}${base_libdir}/mdev/firmware
 }