Check-in [44d63b25ab]
Not logged in

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

Overview

SHA1 Hash:44d63b25abc92eb29968f993c703cdff5183679f
Date: 2012-09-20 02:34:32
User: BarryK
Comment:rerwin: modem updates -3f, b43,b43legacy,brcm,dgcmodem,hsfmodem,wl firmware extracted from woof, separate pets

Tags And Properties
Changes

Changes to woof-code/kernel-skeleton/etc/modules/firmware.dep

@@ -22,11 +22,11 @@
 ar9170usb:ar9170usb.ko
 ath9k_htc:ath9k_htc.ko
 atmel_fw-1.3:atmel_pci.ko,atmel_cs.ko,at76_usb.ko,at76c50x-usb
 b43:b43.ko
 b43legacy:b43legacy.ko
-brcm:brcmfmac.ko,brcmsmac.ko,bcma.ko
+brcm:brcmfmac.ko,brcmsmac.ko
 carl9170:carl9170.ko
 hostap-0.5.7:hostap.ko,hostap_pci.ko,hostap_plx.ko,hostap_cs.ko
 iwlwifi:iwl3945.ko,iwl4965.ko,iwlagn.ko,iwlwifi.ko
 ipw2100_firmware-1.3:ipw2100.ko
 ipw2200_firmware-3.0:ipw2200.ko

Changes to woof-code/kernel-skeleton/lib/modules/README-all-firmware

@@ -1,1 +1,47 @@
+Firmware taken out of all-firmware to separate PETs
+---------------------------------------------------
+
+The directories inside /lib/modules/all-firmware are the "firmware" needed by modems.
+Actually, this can be any data-files, scripts, configuration or even binary-executables.
+
+This "firmware" has been kept in the Woof repository, however the Fossil Version
+Control System Sqlite repository is not the most appropriate place.
+
+So, I am in the process of taking them out, to separate PETs. A Woof developer would
+include these PETs in the package-list, so they will be built-in to the build of Puppy.
+
+Note, the developer would of course choose an appropriate list of firmware PETs to
+include. For example, the "hsfmodem" analog modem firmware might not have an appropriate
+kernel driver in recent kernels. Though, the Woof build script '3builddistro' can
+detect this situation and suggest to remove innapropriate firmware.
+
+These firmware PETs are named "firmware_linux_module_*" to make it unambiguous what
+they are for. The "*" part is the name of the directory inside /lib/modules/all-firmware,
+for example "firmware_linux_module_b43".
+
+Firmware removed from Woof, now PETS
+------------------------------------
+
+b43       (20120920)
+dgcmodem  "
+hsfmodem  "
+b43legacy "
+brcm      "
+wl        "
+
+Further technical notes
+-----------------------
+
+A "firmware_linux_module_*" PET will have files that get installed, just like any PET.
+However, the location /lib/modules/all-firmware is special, as files in here only get
+installed if matching kernel modules are loaded, meaning that the appropriate hardware
+is present.
+
+This keeps files out of the way and not potentially causing conflicts in the system.
+
+To see how a directory inside /lib/modules/all-firmware gets installed, see script
+/sbin/pup_event_backend_modprobe.
 
+Regards,
+Barry Kauler
+Sept. 2012

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0bsinitvals4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0bsinitvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0initvals4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g0initvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1bsinitvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1bsinitvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1initvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/a0g1initvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0bsinitvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0bsinitvals4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0bsinitvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0initvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0initvals4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/b0g0initvals9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0bsinitvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0bsinitvals14.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0bsinitvals15.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0initvals13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0initvals14.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/lp0initvals15.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/n0absinitvals11.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/n0bsinitvals11.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/n0initvals11.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/pcm4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/pcm5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode11.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode13.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode14.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode15.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode16_mimo.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43/lib/firmware/b43/ucode9.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g0bsinitvals2.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g0bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g0initvals2.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g0initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g1bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/a0g1initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/b0g0bsinitvals2.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/b0g0bsinitvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/b0g0initvals2.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/b0g0initvals5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/pcm4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/pcm5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/ucode11.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/ucode2.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/ucode4.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/b43legacy/lib/firmware/b43legacy/ucode5.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/bcm4329-fullmac-4.bin

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/bcm4329-fullmac-4.txt

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/bcm43xx-0.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/bcm43xx_hdr-0.fw

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/brcmfmac43236b.bin

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/brcmfmac4329.bin

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/brcm/lib/firmware/brcm/brcmfmac4330.bin

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/dgcmodem/EMPTYDIRMARKER

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/hsfmodem/EMPTYDIRMARKER

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

@@ -35,6 +35,6 @@
 #'module1:module2' where module2 is the preferred choice.
 #101218 format can have multiple ':', ex: 8139cp:8139too:8139xx (last is most preferred).
 #note, list needs a space char at beginning and at end.
 #w471 removed: ath5k:ath_pci martian_dev:ltserial r8169:r8101
 #101209: added 8139cp:8139too  110204 modified  120523 added ssb:wl
-PREFLIST=' 8139cp:8139too rtl8180:r8180 rtl8187:r8187 rt2500usb:rt73usb orinoco_nortel:hostap_plx orinoco_plx:hostap_plx orinoco_tmd:hostap_plx orinoco_pci:hostap_pci bcm43xx:ssb prism54:p54pci tulip:dmfe option:hso hcfpcihw:hsfpcibasic2 cdc_acm:dgcusbdcp slamr:snd_intel8x0m:snd_via82xx_modem ssb:wl bcma:wl '
+PREFLIST=' 8139cp:8139too rtl8180:r8180 rtl8187:r8187 rt2500usb:rt73usb orinoco_nortel:hostap_plx orinoco_plx:hostap_plx orinoco_tmd:hostap_plx orinoco_pci:hostap_pci bcm43xx:ssb prism54:p54pci tulip:dmfe option:hso hcfpcihw:hsfpcibasic2 cdc_acm:dgcusbdcp slamr:snd_intel8x0m:snd_via82xx_modem ssb:wl bcma:wl ssb:bcma '

Changes to woof-code/rootfs-skeleton/sbin/pup_event_backend_modprobe

@@ -14,10 +14,12 @@
 #110516 no longer using setup_alsa_func. now using /etc/modprobe.d/alsa-base.conf (from Ubuntu) only.
 #111106 support firmware directories.
 #120823 rerwin: $FIRMPKG always written.
 #120823 rerwin: --use-blacklist to apply the blacklist commands in the configuration files (if any) to module names as well.
 #120828 rerwin: --use-blacklist again.
+#120908 rerwin: Change preference processing to ensure preferred module loaded first.
+#120909 rerwin: Use temporary blacklisting for preferences to avoid interference and inconsistency.
 
 export LANG=C
 . /etc/rc.d/PUPSTATE
 . /etc/rc.d/MODULESCONFIG
 
@@ -93,10 +95,15 @@
    fi
   fi
  fi
 }
 
+#120908...
+write_preference_log() {
+ echo "$(date +%H:%M:%S.%N | cut -c 1-12) ${$} $MODULE - $1" >> /tmp/pup_event_backend/preferences.log
+}
+
 #101210 remove. multiple entries with same modalias may be required, for example 3G modem that needs to load usb-storage and option on same interface...
 ##101210 just in case this script called more than once with the same modalias...
 #echo "M=${MODALIAS} " > /tmp/pup_event_backend/protect0-${$}
 #mREGEX='M='"$MODALIAS"' '
 #[ `cat /tmp/pup_event_backend/protect0-* | grep "$mREGEX" | wc -l` -gt 1 ] && exit
@@ -146,23 +153,27 @@
 esac
 
 #101218 bugfix, improve...
 #preferences list, ex rt2500usb and rt73usb both hits, then choose latter...
 modPATTERN='^'"$MODULE"':'
-PREFHIT="`echo -n "$PREFLIST" | tr ' ' '\n' | grep "$modPATTERN"`"
+PREFHIT="`echo -n "$PREFLIST" | tr ' ' '\n' | grep "$modPATTERN" | head -n 1`" #120908
 if [ "$PREFHIT" != "" ];then
- #note, rc.sysinit deletes all blacklist*.conf...
+ origMODULE="$MODULE" #120908
+ cat /etc/modprobe.d/* 2>/dev/null | grep -o '^blacklist  *[^ ]*' | tr -s ' ' > /tmp/pup_event_backend/blacklist-$$.conf #120909
  PREFMODS="`echo -n "$PREFHIT" | cut -f 2-9 -d ':' | tr ':' ' '`"
  for PREFMOD in $PREFMODS #format can have multiple ':', ex: 8139cp:8139too:8139xx (last is most preferred).
  do
-  echo "blacklist $MODULE" > /etc/modprobe.d/blacklist-${MODULE}.conf
+  echo "blacklist $MODULE" >> /tmp/pup_event_backend/blacklist-$$.conf #120909
   #120828 rerwin: --use-blacklist (or -b) to apply the blacklist commands in the configuration files (if any) to module names as well...
-  xMODULE="`/sbin/modprobe -i --use-blacklist --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508 120828
+  xMODULE="`/sbin/modprobe -i --use-blacklist --config /tmp/pup_event_backend/blacklist-$$.conf --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508 120828 120909
   [ "$xMODULE" = "$PREFMOD" ] && MODULE="$xMODULE"
-  [ "$xMODULE" = "" ] && rm -f /etc/modprobe.d/blacklist-${MODULE}.conf
  done
- [ -f /etc/modprobe.d/blacklist-${MODULE}.conf ] && rm -f /etc/modprobe.d/blacklist-${MODULE}.conf
+ rm -f /tmp/pup_event_backend/blacklist-$$.conf #120909
+ [ "$MODULE" = "$origMODULE" ] \
+  && sleep 1 \
+  && write_preference_log "Retained ($PREFHIT)" \
+  || write_preference_log "Substituted for module $origMODULE ($PREFHIT)" #120908
 fi
 
 #module already loaded, exit...
 mREGEX='MODULE='"$MODULE"' DEVPATH'
 if cat /tmp/pup_event_backend/pup_event_module_devpath_log* 2>/dev/null | grep "${mREGEX}" ;then exit ;fi
@@ -216,8 +227,57 @@
 
 #log to file. rc.sysinit needs this info to find out if any modaliases missed (also above)...
 echo "MODULE=$MODULE DEVPATH=$DEVPATH MODALIAS=$MODALIAS" >> /tmp/pup_event_backend/pup_event_module_devpath_log${$}
 
 cd /sbin #v408 rerwin thinks this is needed for slamr module.
-exec /sbin/modprobe $MODULE
+
+#120908 Wait for any preference processing, then ensure a preferred module is loaded first and any active conflicting modules afterward...
+if [ "$(ls /tmp/pup_event_backend/preference_processing_active* 2>/dev/null)" != "" ];then
+ write_preference_log "Began waiting for preference processing"
+ BRKCNT=0
+ while [ $BRKCNT -lt 20 ]; do
+  sleep 0.1
+  BRKCNT=$(($BRKCNT + 1))
+  [ "$(ls /tmp/pup_event_backend/preference_processing_active* 2>/dev/null)" = "" ] && break
+ done
+ write_preference_log "Resumed loading after preference processing"
+fi
+NONPREFS="$(echo -n "$PREFLIST" | tr ' ' '\n' | grep -w -o ".*:${MODULE}$" | sed -e 's/:[^:]*$//' | tr : '\n')"
+[ "$NONPREFS" = "" ] \
+ || [ "$(lsmod | sed 's/ .*//' | grep -E "$(echo $MODULE $NONPREFS | tr ' ' '|')" | tail -n 1 | sed "s/^${MODULE}$//")" = "" ] \
+ && exec /sbin/modprobe $MODULE
+
+touch /tmp/pup_event_backend/preference_processing_active-${$}
+write_preference_log "Began preference reload processing"
+NPRELOADS=""
+ALLDEPENDERS=""
+for ONEMODULE in $NONPREFS;do
+ LOADEDNP="$(lsmod | grep "^$ONEMODULE ")"
+ if [ "$LOADEDNP" = "" ];then
+  LOADEDNP="$(grep -o "^MODULE=${ONEMODULE} " /tmp/pup_event_backend/pup_event_module_devpath_log* | grep -o '[^=]*$')"
+  DEPENDERS=""
+ else
+  DEPENDERS="$(echo -n $LOADEDNP | tr -s ' ' | cut -f 4 -d ' ' | tr -d - | tr , ' ' | tr '\n' ' ' | sed 's/^  *$//')"
+ fi
+ if [ "$LOADEDNP" != "" ];then
+  if [ "$DEPENDERS" != "" ];then
+   /sbin/modprobe -r -i -q $DEPENDERS
+   wait
+   ALLDEPENDERS="${ALLDEPENDERS}${DEPENDERS}"
+  fi
+  /sbin/modprobe -r -i -q $ONEMODULE
+  wait
+  NPRELOADS="${ONEMODULE} ${NPRELOADS}" #reverse order
+ fi
+done
+for ONEMODULE in $MODULE $NPRELOADS $ALLDEPENDERS;do
+ lsmod | grep -q -w "^$ONEMODULE" \
+  && [ "$ONEMODULE" != "$MODULE" ] \
+  && write_preference_log "Unload failed for module: ${ONEMODULE}"
+ /sbin/modprobe $ONEMODULE
+sleep 0.01 #precaution
+done
+write_preference_log "Reloaded module(s): ${NPRELOADS}${ALLDEPENDERS}"
+rm -f /tmp/pup_event_backend/preference_processing_active-${$}
+#120908 end
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/sbin/pmodemdiag

@@ -1,7 +1,8 @@
 #!/bin/bash
 #Barry Kauler, LGPL 2010
+#120828 rerwin: various.
 
 NAMEDATE="`date -u +%Y%m%d`"
 if [ "$1" = "--help" ];then
 	cat 1>&2 << EOT
 
@@ -15,11 +16,11 @@
 resolution.
 EOT
  exit
 fi
 [ -e ~/pmodemdiag-$NAMEDATE.tar.gz ] && echo -e " A file already exists with the intended name of the new tarball file:\n  pmodemdiag-$NAMEDATE.tar.gz\n Please rename or delete it and then rerun pmodemdiag."  && exit
-if [ `cat /etc/puppyversion | cut -b 1-3` -ge 431 ];then
+if [ "`grep '\--silent' /usr/sbin/pupscan 2>/dev/null`" != "" ];then
  echo " Running PupScan silently to get hardware IDs and drivers."
 else
  echo " Running PupScan to get hardware IDs and drivers - please close its window manually."
  sleep 5
 fi
@@ -34,12 +35,12 @@
 cp -f /tmp/udevtrace-modem.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/bootsysinit.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /var/log/messages /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /etc/rc.d/MODULESCONFIG /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 lsmod > /tmp/pmodemdiag-$NAMEDATE/lsmod.txt
-ls -l /etc/init.d > /tmp/pmodemdiag-$NAMEDATE/ls-etc-init.d.txt
-ls -l -R /dev > /tmp/pmodemdiag-$NAMEDATE/ls-dev.txt
+ls -l /etc/init.d &> /tmp/pmodemdiag-$NAMEDATE/ls-etc-init.d.txt
+ls -l -R -A /dev &> /tmp/pmodemdiag-$NAMEDATE/ls-dev.txt
 [ -s /etc/wvdial.conf ] && sed -e 's/^\(Username *= *\).*/\1XXXXXXXX/' \
  -e 's/^\(Password *= *\).*/\1XXXXXXXX/' \
  -e 's/\(AT+CPIN=\)..*/\1XXXX/' \
  /etc/wvdial.conf > /tmp/pmodemdiag-$NAMEDATE/wvdial.conf.txt 2> /dev/null
 cp -f /tmp/pupdial.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
@@ -47,23 +48,25 @@
 [ -e /etc/ppp/peers/gprsmm ] && grep '^[^#]' /etc/ppp/peers/gprsmm > /tmp/pmodemdiag-$NAMEDATE/gprsmm 2> /dev/null
 cp -f /tmp/logwvdialprobe /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/usb_modeswitch.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/usb_modeswitch.temp.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/usb_modeswitch.active /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
-cp -f /tmp/ozerocdoff.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
-cp -f /tmp/osetsuspend.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
-ls -1 /sys/class/tty/ttyHS* > /tmp/pmodemdiag-$NAMEDATE/ls-ttyHS.txt 2> /dev/null
+#@cp -f /tmp/ozerocdoff.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+#@cp -f /tmp/osetsuspend.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 if [ "`lsmod | grep '^hso '`" != "" ];then
+ ls -1 /sys/class/tty/ttyHS* > /tmp/pmodemdiag-$NAMEDATE/ls-ttyHS.txt 2> /dev/null
  TTYS=`find /sys/class/tty -name "ttyHS*"`
  for i in $TTYS; do
   echo "$i/hsotype: `cat $i/hsotype`" >> /tmp/pmodemdiag-$NAMEDATE/ttyHS_hsotypes
  done
 fi
 [ "`which pup_event_backend_modprobe_protect`" != "" ] \
  && /sbin/pup_event_backend_modprobe_protect --dump 2> /dev/null
 sleep 1
 cp -f /tmp/pup_event_backend_modprobe_protect.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+[ -s /tmp/pup_event_backend_modprobe_protect_daemon.log ] \
+ && cp -f /tmp/pup_event_backend_modprobe_protect_daemon.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null #110209
 cp -f /etc/modules.conf /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cat /proc/devices > /tmp/pmodemdiag-$NAMEDATE/proc_devices.txt 2> /dev/null
 cp -f /tmp/usb_modeswitch_scsi-info.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /etc/rc.d/rc.local /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 ifconfig > /tmp/pmodemdiag-$NAMEDATE/ifconfig.txt 2> /dev/null
@@ -72,22 +75,23 @@
 touch /tmp/pmodemdiag-$NAMEDATE/kernel-`uname -r`
 cp -f /tmp/xerrs.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/.usbserial_dependents /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 ls -1 /etc/modprobe.d/* > /tmp/pmodemdiag-$NAMEDATE/ls-grep-etc-modprobe.d.txt 2> /dev/null
 echo >> /tmp/pmodemdiag-$NAMEDATE/ls-grep-etc-modprobe.d.txt 2> /dev/null
-grep -H '' /etc/modprobe.d/* | sed 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/ls-grep-etc-modprobe.d.txt 2> /dev/null
+grep -H '' /etc/modprobe.d/* 2> /dev/null | sed -e 's%/etc/modprobe.d/%%' -e 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/ls-grep-etc-modprobe.d.txt
 #For reworked modem support in Wary/Quirky+:
 cp -f /var/log/usb_modeswitch_* /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /tmp/pupdial_port_test /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /var/local/pupdial/usb_modem_port /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 cp -f /var/local/pupdial/usbids /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
-[ -d /tmp/pup_event_backend ] \
- && grep -H '' /tmp/pup_event_backend/pup_event_module_devpath_log* | sed 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/grep-tmp-module_devpath_log.txt 2> /dev/null
-[ -d /tmp/pup_event_backend ] \
- && grep -H '' /tmp/pup_event_backend/pup_event_alsa_cnt* | sed 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/grep-tmp-alsa_cnt.txt 2> /dev/null
+if [ -d /tmp/pup_event_backend ];then
+ grep -H '' /tmp/pup_event_backend/pup_event_module_devpath_log* 2> /dev/null | sed -e 's%/tmp/pup_event_backend/pup_event_module_%%' -e 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/grep-tmp-module_devpath_log.txt
+ cp -f /tmp/pup_event_backend/preferences.log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+ cp -f /tmp/pup_event_backend/preferences-* /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+fi
 [ -d /tmp/rc_sysinit ] \
- && grep -H '' /tmp/rc_sysinit/* | sed 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/grep-tmp-rc_sysinit.txt 2> /dev/null
+ && grep -H '' /tmp/rc_sysinit/* 2> /dev/null | sed -e 's%/tmp/rc_sysinit/%%' -e 's/:/: /' >> /tmp/pmodemdiag-$NAMEDATE/grep-tmp-rc_sysinit.txt
 
 if [ "`which hciconfig`" != "" ];then
  cp -f /etc/bluetooth/*.conf /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
  hciconfig -a 2>&1 > /tmp/pmodemdiag-$NAMEDATE/hciconfig.txt
  if [ "`which hcitool`" != "" ];then
@@ -99,19 +103,31 @@
   && rfcomm -a 2>&1 > /tmp/pmodemdiag-$NAMEDATE/rfcomm.txt
  [ "`which sdptool`" != "" ] \
   && sdptool browse 2>&1 > /tmp/pmodemdiag-$NAMEDATE/sdptool.txt
 fi
 
-grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type &> /tmp/pmodemdiag-$NAMEDATE/grep-sys-bus-usb-devices-ep-type-interrupt.txt
+grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type 2> /dev/null | sed -e 's%/sys/bus/usb/devices%%' -e 's/:/: /' > /tmp/pmodemdiag-$NAMEDATE/grep-sys-bus-usb-devices-ep-type-interrupt.txt
 
 cat /tmp/usb_modeswitch*/usb_modeswitch* > /tmp/pmodemdiag-$NAMEDATE/usb_modeswitch_logs 2> /dev/null
 cat /var/lib/usb_modeswitch/* > /tmp/pmodemdiag-$NAMEDATE/var_lib_usb_modeswitch_lists 2> /dev/null
 grep -E 'agrmodem|intelmodem' /lib/modules/2.6.*/modules.dep > /tmp/pmodemdiag-$NAMEDATE/grep-modem-modules_dep.txt 2> /dev/null
 
+cat /proc/asound/cards /proc/asound/modules > /tmp/pmodemdiag-$NAMEDATE/proc_asound.txt 2> /dev/null
+[ -e /initrd/pup_ro1/root ] \
+ && ls -l -R -A /initrd/pup_ro1/dev &> /tmp/pmodemdiag-$NAMEDATE/ls_pup_ro1_dev.txt 2> /dev/null
+grep -H '' /etc/network-wizard/*/*/* 2> /dev/null | sed -e 's%/etc/network-wizard%%' -e 's/:/: /' > /tmp/pmodemdiag-$NAMEDATE/network-wizard.txt
+grep -H '' /etc/simple_network_setup/* 2> /dev/null | sed -e 's%/etc/simple_network_setup%%' -e 's/:/: /' > /tmp/pmodemdiag-$NAMEDATE/simple_network_setup.txt
+cp -f /tmp/sns_wireless_log /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /tmp/sns_connections_available /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /tmp/sns_connections_wireless /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /tmp/sns_interface_success /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /tmp/sns_interfaces /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /tmp/ssb_dependers /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
+cp -f /etc/modules/firmware.dep.inst.* /tmp/pmodemdiag-$NAMEDATE/ 2> /dev/null
 
 sync
 cd /tmp
 tar -czf ~/pmodemdiag-$NAMEDATE.tar.gz pmodemdiag-$NAMEDATE
 cd
 echo " Diagnostic file collection complete."
-echo -e " Tarball pmodemdiag-$NAMEDATE.tar.gz can be attached to a posting or personal\n  message (PM) in the Puppy forum, for analysis of dialup modem issues."
-echo " The content can be found in /tmp/pmodemdiag-$NAMEDATE/."
+echo -e " Tarball /root/pmodemdiag-$NAMEDATE.tar.gz can be attached to a posting or\n  personal message (PM) in the Puppy forum, for analysis of dialup-modem\n  or other issues."
+echo " The content can be viewed in /tmp/pmodemdiag-$NAMEDATE/."

Changes to woof-distro/Packages-puppy-noarch-official

@@ -24,13 +24,18 @@
 desk_icon_theme_stark042-1|desk_icon_theme_stark042|1||Desktop|492K||desk_icon_theme_stark042-1.pet|+gtk+|black-white-orange line-art style icons, based on area042 icons||||
 desk_icon_theme_malays_uniblack-1|desk_icon_theme_malays_uniblack|1||Desktop|264K||desk_icon_theme_malays_uniblack-1.pet||desktop and menu icons, black lines, put together by vicmz||||
 desk_icon_theme_malays_uniblue-1|desk_icon_theme_malays_uniblue|1||Desktop|332K||desk_icon_theme_malays_uniblue-1.pet||desktop and menu icons, pale blue lines, put together by vicmz||||
 desk_icon_theme_neu-1|desk_icon_theme_neu|1||Desktop|172K||desk_icon_theme_neu-1.pet||desktop and menu icons, modern multi-color, put together by jemimah||||
 desk_icon_theme_shining_silver-1|desk_icon_theme_shining_silver|1||Desktop|272K||desk_icon_theme_shining_silver-1.pet||desktop and menu icons, silver-color with blue highlights, put together by vicmz||||
-dgcmodem-1.13-20120910-1|dgcmodem|1.13-20120910-1||BuildingBlock|116K||dgcmodem-1.13-20120910-1.pet||kernel-independent DGC modem driver components, created by rerwin||||
 ffconvert-1.3|ffconvert|1.3||Multimedia|368K||ffconvert-1.3.pet|+ffmpeg|FFConvert multimedia converter||||
 ffconvert_NLS-1.2.1|ffconvert_NLS|1.2.1||Multimedia|304K||ffconvert_NLS-1.2.1.pet|ffconvert|FFConvert multimedia converter||||
+firmware_linux_module_b43-120920|firmware_linux_module_b43|120920||BuildingBlock|408K||firmware_linux_module_b43-120920.pet||firmware and all support files needed for kernel module b43||||
+firmware_linux_module_b43legacy-20120920|firmware_linux_module_b43legacy|20120920||BuildingBlock|180K||firmware_linux_module_b43legacy-20120920.pet||firmware and support files files for kernel module b43legacy||||
+firmware_linux_module_brcm-20120920|firmware_linux_module_brcm|20120920||BuildingBlock|1244K||firmware_linux_module_brcm-20120920.pet||firmware and support files for kernel modules brcmfmac.ko, brcmsmac.ko, bcma.ko||||
+firmware_linux_module_dgcmodem-1.13-20120920|firmware_linux_module_dgcmodem|1.13-20120920||BuildingBlock|116K||firmware_linux_module_dgcmodem-1.13-20120920.pet||kernel-independent DGC modem driver components, created by rerwin||||
+firmware_linux_module_hsfmodem-7.80.02.06-20120920|firmware_linux_module_hsfmodem|7.80.02.06-20120920||BuildingBlock|830K||firmware_linux_module_hsfmodem-7.80.02.06-20120920.pet||HSF modem kernel-independent interfaces & data, pet created by rerwin||||
+firmware_linux_module_wl-20120920|firmware_linux_module_wl|20120920||BuildingBlock|36K||firmware_linux_module_wl-20120920.pet||firmware and support files for kernel module wl.ko||||
 getflash-1.1|getflash|1.1||Internet|56K||getflash-1.1.pet||GetFlash Install Flashplayer||||
 gtk_theme_citrus_cut-1.2|gtk_theme_citrus_cut|1.2||Desktop|172K||gtk_theme_citrus_cut-1.2.pet|+gtk+|gtk2 orangy theme||||
 gtk_theme_delicate_blue-1|gtk_theme_delicate_blue|1||Desktop|48K||gtk_theme_delicate_blue-1.pet|+gtk+|gtk theme, light blue/grey, graduated blue buttons||||
 gtk_theme_fishing_the_sky-0.4|gtk_theme_fishing_the_sky|0.4||Desktop|116K||gtk_theme_fishing_the_sky-0.4.pet|+gtk+|gtk theme, small grey||||
 gtk_theme_fishpie-0.11|gtk_theme_fishpie|0.11||Desktop|304K||gtk_theme_fishpie-0.11.pet|+gtk+|gtk theme||||

Changes to woof-distro/arm/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

@@ -142,10 +142,16 @@
 no|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 yes|file||exe,dev,doc,nls
 no|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox|iceweasel,libnspr4-0d,libnss3-1d,xulrunner-1.9.1|exe,dev,doc,nls| #firefox
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 no|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls

Changes to woof-distro/arm/gentoo/gap6/DISTRO_PKGS_SPECS-gentoo-gap6

@@ -136,10 +136,16 @@
 no|file|file|exe,dev,doc,nls
 yes|file||exe,dev,doc,nls|
 no|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firewallstate||exe
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac|exe,dev,doc,nls
 no|flashplayer10||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 no|floppy_format||exe
 no|flsynclient||exe

Changes to woof-distro/arm/raspbian/wheezy/DISTRO_PKGS_SPECS-raspbian-wheezy

@@ -156,10 +156,16 @@
 yes|file||exe,dev,doc,nls
 no|file_sharing-curlftpfs-mpscan||exe| #note, currently has x86 binaries in it.
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox|firefox|exe,dev,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 no|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 no|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls

Changes to woof-distro/arm/ubuntu/lucid/DISTRO_PKGS_SPECS-ubuntu-lucid

@@ -145,10 +145,16 @@
 yes|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 no|file||exe
 no|file_sharing-curlftpfs-mpscan||exe| #note, currently has x86 binaries in it.
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 no|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 no|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -155,10 +155,16 @@
 yes|file||exe,dev,doc,nls
 no|file_sharing-curlftpfs-mpscan||exe| #note, currently has x86 binaries in it.
 yes|findutils|findutils|exe,dev>null,doc,nls
 yes|firefox|firefox|exe,dev,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 no|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 no|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls

Changes to woof-distro/x86/arch/rolling-release/DISTRO_PKGS_SPECS-arch

@@ -134,10 +134,16 @@
 yes|ffmpeg||exe,dev,doc,nls
 no|file|file|exe,dev>null,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls
 yes|fossil||exe>dev,dev,doc>dev,nls

Changes to woof-distro/x86/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

@@ -139,10 +139,16 @@
 no|ffmpeg||exe,dev,doc,nls
 no|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls

Changes to woof-distro/x86/mageia/1/DISTRO_PKGS_SPECS-mageia-1

@@ -128,10 +128,16 @@
 yes|ffmpeg_part_hack||exe| #ffmpeg compiled in drake has missing libavcore.so, needed by mplayer that was compiled in wary.
 no|file|file,libmagic1,libmagic-devel|exe,dev,doc,nls|
 yes|file||exe,dev,doc,nls|
 yes|file_sharing-curlftpfs-mpscan||exe|
 yes|findutils|findutils|exe,dev>null,doc,nls|
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|libflac8,libflac-devel|exe,dev,doc,nls| #have left out flac, which is enormous. needed by libsndfile
 no|flashplayer10||exe|
 yes|flex|flex|exe>dev,dev,doc,nls|
 yes|fonttosfnt|fonttosfnt|exe,dev,doc,nls #needed by x11-font-util
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls|

Changes to woof-distro/x86/mageia/cauldron/DISTRO_PKGS_SPECS-mageia-cauldron

@@ -128,10 +128,16 @@
 yes|ffmpeg_part_hack||exe| #ffmpeg compiled in drake has missing libavcore.so, needed by mplayer that was compiled in wary.
 no|file|file,libmagic1,libmagic-devel|exe,dev,doc,nls|
 yes|file||exe,dev,doc,nls|
 yes|file_sharing-curlftpfs-mpscan||exe|
 yes|findutils|findutils|exe,dev>null,doc,nls|
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|libflac8,libflac-devel|exe,dev,doc,nls| #have left out flac, which is enormous. needed by libsndfile
 no|flashplayer10||exe|
 yes|flex|flex|exe>dev,dev,doc,nls|
 yes|fonttosfnt|fonttosfnt|exe,dev,doc,nls #needed by x11-font-util
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls|

Changes to woof-distro/x86/pet-based/racy/DISTRO_PKGS_SPECS-puppy-wary5

@@ -164,10 +164,16 @@
 no|ffplay||exe
 yes|file|file|exe,dev,doc,nls
 no|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac|exe,dev,doc,nls
 no|flashplayer|flashplayer-9*|exe,dev,doc,nls
 no|flashplayer9||exe
 no|flashplayer|flashplayer10-10.3.*|exe|pet:common
 no|flatzebra||exe,dev,doc,nls

Changes to woof-distro/x86/pet-based/wary/DISTRO_PKGS_SPECS-puppy-wary5

@@ -165,10 +165,16 @@
 no|ffplay||exe
 yes|file|file|exe,dev,doc,nls
 no|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+yes|firmware_linux_module_dgcmodem||exe
+yes|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac|exe,dev,doc,nls
 no|flashplayer|flashplayer-9*|exe,dev,doc,nls
 no|flashplayer9||exe
 no|flashplayer|flashplayer10-10.3.*|exe|pet:common
 no|flatzebra||exe,dev,doc,nls

Changes to woof-distro/x86/slackware/13.1/DISTRO_PKGS_SPECS-slackware-13.1

@@ -132,10 +132,16 @@
 yes|ffmpeg||exe,dev,doc,nls
 no|file|file|exe,dev,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac|exe,dev,doc,nls
 yes|flashplayer10||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|floppy_format||exe
 yes|flsynclient||exe

Changes to woof-distro/x86/slackware/13.37/DISTRO_PKGS_SPECS-slackware-13.37

@@ -147,10 +147,16 @@
 no|file|file|exe,dev,doc,nls
 yes|file||exe,dev,doc,nls
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 yes|firewallstate||exe
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|firstrun||exe
 yes|flac|flac|exe,dev,doc,nls
 no|flashplayer10||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|floppy_format||exe

Changes to woof-distro/x86/ubuntu/jaunty/DISTRO_PKGS_SPECS-ubuntu-jaunty

@@ -137,10 +137,11 @@
 yes|ffmpeg||exe,dev,doc,nls
 no|file|file,libmagic1,libmagic-dev|exe,dev>null,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_module_b43||exe| #120919 have taken these out of woof, now pets.
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 #latest is a pet pkg... no, stay with deb pkgs...
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls

Changes to woof-distro/x86/ubuntu/karmic/DISTRO_PKGS_SPECS-ubuntu-karmic

@@ -133,10 +133,11 @@
 yes|ffmpeg||exe,dev,doc,nls
 no|file|file,libmagic1,libmagic-dev|exe,dev>null,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
+yes|firmware_module_b43||exe| #120919 have taken these out of woof, now pets.
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 #latest is a pet pkg... no, stay with deb pkgs...
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls

Changes to woof-distro/x86/ubuntu/lucid/DISTRO_PKGS_SPECS-ubuntu-lucid

@@ -170,10 +170,11 @@
 no|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
+yes|firmware_module_b43||exe| #120919 have taken these out of woof, now pets.
 yes|firstrun_lucid||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|flsynclient||exe

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -164,10 +164,16 @@
 no|file|file,libmagic1,libmagic-dev|exe,dev,doc,nls
 yes|file||exe
 yes|file_sharing-curlftpfs-mpscan||exe
 yes|findutils|findutils|exe,dev>null,doc,nls
 no|firefox-flash|firefox|exe,dev,doc>null,nls>null
+yes|firmware_linux_module_b43||exe #120919 have taken these out of woof, now pets.
+yes|firmware_linux_module_b43legacy||exe
+yes|firmware_linux_module_brcm||exe
+no|firmware_linux_module_dgcmodem||exe
+no|firmware_linux_module_hsfmodem||exe
+yes|firmware_linux_module_wl||exe
 yes|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer10|flashplayer10-10.3.*|exe,dev,doc,nls|pet:common
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls