[oe-commits] org.oe.dev altboot_1.1.1+wip-SVNR66.bb : add patch to get devnodes for mmcblkp? from
xora commit
openembedded-commits at lists.openembedded.org
Tue Oct 30 16:06:02 UTC 2007
altboot_1.1.1+wip-SVNR66.bb : add patch to get devnodes for mmcblkp? from
sysfs so they work even though they have changed in different kernels.
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 1eb324d5a4e1d04bdf8322f957372dd4513b1dfd
ViewMTN: http://monotone.openembedded.org/revision/info/1eb324d5a4e1d04bdf8322f957372dd4513b1dfd
Files:
1
packages/altboot/files
packages/altboot/files/sd-dynamic-fix.patch
packages/altboot/altboot_1.1.1+wip-SVNR66.bb
Diffs:
#
# mt diff -r2bb927dd4e693bee09958f8b1b69f632111fffcb -r1eb324d5a4e1d04bdf8322f957372dd4513b1dfd
#
#
#
# add_dir "packages/altboot/files"
#
# add_file "packages/altboot/files/sd-dynamic-fix.patch"
# content [6ce619d3da3cee65ea33597fac52722e50f381a8]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
# from [7cb617a49e20203b0f89fb39efef91b8ec68009a]
# to [32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0]
#
============================================================
--- packages/altboot/files/sd-dynamic-fix.patch 6ce619d3da3cee65ea33597fac52722e50f381a8
+++ packages/altboot/files/sd-dynamic-fix.patch 6ce619d3da3cee65ea33597fac52722e50f381a8
@@ -0,0 +1,44 @@
+Index: trunk/altboot.func
+===================================================================
+--- trunk.orig/altboot.func 2007-10-30 15:48:16.000000000 +0000
++++ trunk/altboot.func 2007-10-30 15:48:21.000000000 +0000
+@@ -499,17 +499,6 @@
+ then
+ echo "Note: $SD_MOUNTPOINT is already mounted"
+ else
+- # We can't trust that the SD device file is there when running kernel 2.6 w/ udev
+- # and starting udev at this point may not be the best idea...
+- if `uname -r | grep -q "2.6"`
+- then
+- #Let's just assume the device file name never changes...
+- dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`"
+- part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`"
+- ! test -e /dev/mmcblk${dev_no} && mknod /dev/mmcblk${dev_no} b 254 0
+- ! test -e /dev/mmcblk${dev_no}p${part_no} && mknod /dev/mmcblk${dev_no}p${part_no} b 254 $part_no
+- fi
+-
+ # Kernel 2.6 has the SD driver compiled into the kernel
+ if test -n "$SD_KERNEL_MODULE"
+ then
+@@ -544,6 +533,21 @@
+ fi
+ fi
+
++ # We can't trust that the SD device file is there when running kernel 2.6 w/ udev
++ # and starting udev at this point may not be the best idea...
++ if `uname -r | grep -q "2.6"`
++ then
++ #Let's just assume the device file name never changes...
++ dev_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\1/p"`"
++ part_no="`echo "$SD_DEVICE" | sed -n "s/\/dev\/mmcblk\(.*\)p\(.*\)/\2/p"`"
++ if [ -f /sys/block/mmcblk${dev_no}/mmcblk${dev_no}p${part_no}/dev ]
++ then
++ rm -f /dev/mmcblk${dev_no}p${part_no} || true
++ mknod /dev/mmcblk${dev_no}p${part_no} b `cat /sys/block/mmcblk${dev_no}/mmcblk${dev_no}p${part_no}/dev|sed 's/:/ /' `
++ fi
++
++ fi
++
+ sleep 3
+
+ check_fs "$SD_DEVICE"
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR66.bb 7cb617a49e20203b0f89fb39efef91b8ec68009a
+++ packages/altboot/altboot_1.1.1+wip-SVNR66.bb 32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0
@@ -1,9 +1,10 @@ require altboot.inc
require altboot.inc
-PR = "r0"
+PR = "r1"
SVN_REV = "66"
-SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV}"
+SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
+ file://sd-dynamic-fix.patch;patch=1"
do_install() {
install -d ${D}/sbin
More information about the Openembedded-commits
mailing list