Check-in [c74bc1e0cf]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:c74bc1e0cfc78538a0a88123af6171b71d167db7
Date: 2012-01-24 14:56:47
User: BarryK
Comment:tracing problem of b43 firmware not loading, peebee posted udev trace, determined ssb uevent replay missing, found test for <2.6.24 kernel broken for 3.x in rc.sysinit

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.sysinit

@@ -63,10 +63,11 @@
 #110712 fixes for kernel with usb core (including usb-storage) drivers builtin.
 #110722 get rid of stray modules.* files, may occur when mix usage of the two depmods.
 #110814 01micko: ensure unique hostname.
 #110814 kernel with inbuilt usb drivers, usbfs was not mounting on /proc/bus/usb.
 #110823 mavrothal: Check if it is an OLPC XO and add the devices.
+#120124 tracing problem of b43 firmware not loading, peebee posted udev trace, determined ssb uevent replay missing, found test for <2.6.24 kernel broken for 3.x.
 
 #unset TZ #100319 busybox hwclock gives priority to this (rather than /etc/localtime) and 'init' has set it wrong.
 #...comment-out for now. note, TZ now set in rc.country.
 export LANG=C
 
@@ -149,11 +150,11 @@
 QTRFREERAM=`expr $FREERAM \/ 4`
 mount -t tmpfs -o size=${QTRFREERAM}k shmfs /dev/shm ;STATUS=$((STATUS+$?))
 
 #w478 moved this code above call to rc.update...
 KERNVER="`uname -r`"
-KERNMAJ=`echo -n "$KERNVER" | cut -f 3 -d '.' | cut -f 1 -d '-' | cut -f 1 -d '_'` #v431 100831
+#KERNMAJ=`echo -n "$KERNVER" | cut -f 3 -d '.' | cut -f 1 -d '-' | cut -f 1 -d '_'` #v431 100831. 120124 remove.
 #w469 may need to run 'depmod'...
 #live-cd may have been built without the modules.* files.
 #initrd init script copied modules to /lib/modules/<kernver>/initrd/.
 if [ ! -f /lib/modules/${KERNVER}/modules.dep ];then
  NEEDDEPMOD="yes" #w469 files may not be there to save space.
@@ -477,11 +478,12 @@
 ## while [ "`grep 'twosectimeout' /tmp/pup_event_backend_s`" = "" ];do #wait until uevents processed.
 ##  sleep 0.5
 ## done
 ##fi
 
-if [ $KERNMAJ -lt 24 ];then #v431
+#if [ $KERNMAJ -lt 24 ];then #v431
+if vercmp $KERNVER lt '2.6.24';then #120124
  [ -e /sys/bus/pcmcia/devices ] && NEWPCMCIA="`ls /sys/bus/pcmcia/devices/*/modalias | tr '\n' ' '`"
  [ -e /sys/bus/usb/devices ] && NEWUSB="`ls /sys/bus/usb/devices/*/modalias | tr '\n' ' '`"
  for ONEMODALIAS in ${NEWPCMCIA}${NEWUSB}
  do
   ONEPATH="`dirname $ONEMODALIAS`"