Check-in [4ca1741e19]
Not logged in

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

Overview

SHA1 Hash:4ca1741e19c4b315eb9549f6e1c8de597e8dd1e1
Date: 2012-08-28 07:44:09
User: BarryK
Comment:rerwin 3+ fixes, scripts pup_event_backend_modprobe, functions4puppy4

Tags And Properties
Changes

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

@@ -3,17 +3,19 @@
 #w468 not using set_mixers() anymore, it's done in /etc/init.d/alsa.
 #w468 choosemousefunc() simplified.
 #101120 new firmware_tarball_func, as /sbin/pup_event_backend_modprobe rewritten.
 #110722 usb drive, LED light briefly flashes after unmounted, so wait a bit. 110828 remove.
 #120209 slight changes so that SSS mechanism can substitute translations. (see /usr/share/sss/script_strings)
+#120828 rerwin: record firmware installed in /etc/modules/firmware.dep.inst.${KERNVER}
+#120828 grep needs -E option, as expression is extended regular expression.
 
 #101119 called from rc.sysinit...
 #global $MODULE is name of module, global $KERNVER.
 firmware_tarball_func() {
  MODULEx="`echo -n "$MODULE" | tr '_' '-'`"
  iPATTERN='^'"${MODULE}"'$|^'"${MODULEx}"'$'
- if [ "`grep "$iPATTERN" /etc/modules/firmware.dep.inst.${KERNVER}`" = "" ];then
+ if [ "`grep -E "${iPATTERN}" /etc/modules/firmware.dep.inst.${KERNVER}`" = "" ];then #120828 extended-reg-expr
   fPATTERN='[:,]'"${MODULE}"'\.ko|[:,]'"${MODULEx}"'\.ko'
   FIRMPKG="`cat /etc/modules/firmware.dep.${KERNVER}  | grep -v '^#' | grep ':' | grep -E "$fPATTERN" | cut -f 1 -d ':' | head -n 1`"
   if [ "$FIRMPKG" != "" ];then
    if [ -f /lib/modules/all-firmware/${FIRMPKG}.tar.gz ];then
     tar -z -x --strip=1 --directory=/ -f /lib/modules/all-firmware/${FIRMPKG}.tar.gz > /dev/null 2>&1
@@ -30,10 +32,11 @@
      echo "$MODULE" >> /etc/modules/firmware.dep.inst.${KERNVER}
      cd /
      /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
      rm -f /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
     fi
+    echo "$FIRMPKG" >> /etc/modules/firmware.dep.inst.${KERNVER} #120828
    fi
   fi
  fi
 }
 

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

@@ -13,10 +13,11 @@
 #110509 avoid chance of a module not getting loaded when almost-simultaneous 'add' uevents.
 #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.
 
 export LANG=C
 . /etc/rc.d/PUPSTATE
 . /etc/rc.d/MODULESCONFIG
 
@@ -115,11 +116,12 @@
 #101202 usb_storage may have claimed an interface that is needed by another module (dual-mode 3G modems)...
 if [ "$MODULE" = "usb_storage" ];then
  if [ "`lsmod | grep '^usb_storage '`" != "" ];then
   if [ ! -f /etc/modprobe.d/blacklist-usb_storage.conf ];then
    echo 'blacklist usb_storage' > /etc/modprobe.d/blacklist-usb_storage.conf
-   MODULE="`/sbin/modprobe -i --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508
+   #120828 rerwin: --use-blacklist (or -b) to apply the blacklist commands in the configuration files (if any) to module names as well...
+   MODULE="`/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
    [ "$MODULE" = "" ] && exit 1
   fi
  fi
 fi
 
@@ -151,11 +153,12 @@
  #note, rc.sysinit deletes all blacklist*.conf...
  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
-  xMODULE="`/sbin/modprobe -i --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508
+  #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" = "$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
 fi

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

@@ -70,11 +70,11 @@
 pcurlftp_file_sharing-0.2|pcurlftp_file_sharing|0.2||Network|116K||pcurlftp_file_sharing-0.2.pet|+pure-ftpd,+curlftpfs,+mpscan,+xdialog,+fuse|connect to ftp servers, share files||||
 pdvdrsab-0.1|pdvdrsab|0.1||Multimedia|52K||pdvdrsab-0.1.pet|+gtkdialog3,+dvdauthor,+vobcopy,+vamps,+ffmpeg|dvd rip,shrink,author,burn||||
 peasypdf-1.4|peasypdf|1.4||Document|52K||peasypdf-1.4.pet||Build multi-page PDF documents||||
 peasyprint-1.8|peasyprint|1.8||Graphic|60K||peasyprint-1.8.pet|+gphotofs,+gtkdialog3|PeasyPrint graphic/photo printing||||
 pfilesearch-1.32|pfilesearch|1.32||BuildingBlock|84K||pfilesearch-1.32.pet|+gtkdialog4|file finder engine|||official|
-pfind-5.01|pfind|5.01||Filesystem|180K||pfind-5.01.pet|+gtkdialog4,+pfilesearch|Pfind file finder|||official|
+pfind-5.04|pfind|5.04||Filesystem|188K||pfind-5.04.pet|+gtkdialog4,+pfilesearch|Pfind file finder|||official|
 phash-2|phash|2||Desktop|24K||phash-2.pet|+rox_filer|adds to rox right-click menu, calc md5sum/sha1sum of a file||||
 playmusic_mplayer-0.1.7-noarch|playmusic_mplayer|0.1.7-noarch||Multimedia|164K||playmusic_mplayer-0.1.7-noarch.pet||A simple lightweight GUI for audio players||||
 pmetatagger-2.1|pmetatagger|2.1||Multimedia|80K||pmetatagger-2.1.pet|+gtkdialog3,+id3lib,+vorbis-tools|audio file tag editor||||
 pmirror-0.5|pmirror|0.5||Utility|44K||pmirror-0.5.pet|+gtkdialog3,+mirdir|Pmirror backup a directory||||
 pmirrorget-0.1.1|pmirrorget|0.1.1||Internet|28K||pmirrorget-0.1.1.pet|+gtkdialog3|Website File Grabber||||
@@ -102,10 +102,11 @@
 puptv-0.3-1|puptv|0.3-1||Multimedia|96K||puptv-0.3-1.pet|+gxine|watch streaming television||||
 pupx-0.3|pupx|0.3||Desktop|48K||pupx-0.3.pet||Pupx X settings||||
 pwget-0.2|pwget|0.2||Internet|56K||pwget-0.2.pet|+wget,+gtkdialog3|file downloader frontend for wget||||
 pwsget-0.1|pwsget|0.1||Internet|40K||pwsget-0.1.pet|+gtkdialog3|Pwsget secure file downloader||||
 pzchmview-1.0d-1|pzchmview|1.0d-1||Document|28K||pzchmview-1.0d-1.pet|+chmlib|PZCHMView CHM Viewer||||
+radeon_firmware-120813|radeon_firmware|120813||System|112K||radeon_firmware-120813.pet||radeon firmware||||
 sfs-converter-1.3.2-1|sfs-converter|1.3.2-1||Setup|44K||sfs-converter-1.3.2-1.pet|+gtkdialog3,+squashfs-tools,+squashfs-tools4|Utility to convert sfs 3 to 4, vice versa||||
 sfs_load-1.9.6|sfs_load|1.9.6||Setup|196K||sfs_load-1.9.6.pet||Load Squash files||||
 shared-mime-info-0.70-6|shared-mime-info|0.70-6||BuildingBlock|272K||shared-mime-info-0.70-6.pet||mime information||||
 shared-mime-info_DEV-0.70-6|shared-mime-info_DEV|0.70-6||BuildingBlock|3772K||shared-mime-info_DEV-0.70-6.pet|+shared-mime-info|mime information||||
 shareinternet-2.2.4-1|shareinternet|2.2.4-1||Network|136K||shareinternet-2.2.4-1.pet|+gtkdialog3,+dnsmasq|run puppy as a router||||

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

@@ -426,10 +426,11 @@
 yes|pwireless||exe
 yes|pwsget||exe
 yes|python|python|exe>dev,dev,doc,nls
 no|python-libxml2||exe>dev,dev,doc,nls|+libxml2
 yes|quisp||exe,dev,doc>dev,nls
+yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|readline|exe,dev,doc,nls
 no|replaceit||exe
 yes|ripoff||exe,dev>null,doc,nls
 yes|rman||exe>dev,dev,doc,nls
 yes|rox_filer||exe

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

@@ -541,10 +541,11 @@
 yes|pwsget||exe
 yes|python|python,python2.5-minimal,python2.5|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe
 no|quisp||exe,dev,doc>dev,nls
+yes|radeon_firmware||exe,dev,doc,nls
 no|readline|libreadline5,libreadline5-dev|exe,dev,doc,nls
 yes|readline|libreadline6,libreadline-dev,libreadline6-dev|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls| #debian does not have this.

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

@@ -534,10 +534,11 @@
 yes|pwsget||exe|
 yes|pxlib|pxlib,libpx0,libpx-devel|exe,dev,doc,nls| #needed by gnumeric
 yes|python|python,libpython2.7|exe>dev,dev,doc,nls|
 no|python-libxml2|python-libxml2|exe>dev,dev,doc,nls| #no mageia pkg.
 yes|pzchmview||exe|
+yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|libreadline6,libreadline-devel|exe,dev,doc,nls|
 no|replaceit||exe|
 yes|retrovol||exe|
 no|ripoff||exe| #no mageia pkg.
 yes|rman|rman|exe>dev,dev,doc,nls|

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

@@ -564,10 +564,11 @@
 yes|python|python|exe>dev,dev,doc,nls
 no|python-libxml2|python-lxml|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe
 no|qt4|qt4|exe,dev,doc,nls
 no|quisp||exe,dev,doc>dev,nls
+yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|readline|exe,dev,doc,nls
 yes|replaceit||exe
 yes|retrovol||exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls

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

@@ -563,10 +563,11 @@
 yes|python|python|exe>dev,dev,doc,nls
 no|python-libxml2|python-lxml|exe>dev,dev,doc,nls|+libxml2
 yes|pzchmview||exe
 no|qt4|qt4|exe,dev,doc,nls
 no|quisp||exe,dev,doc>dev,nls
+yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|readline|exe,dev,doc,nls
 yes|replaceit||exe
 yes|retrovol||exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls

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

@@ -597,10 +597,11 @@
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
 yes|python|python,python2.7-minimal,python2.7|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
+yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls

Changes to woof-distro/x86/ubuntu/precise/Packages-puppy-precise-official

@@ -1,6 +1,7 @@
 0hack1_precise_dev-20120820|0hack1_precise_dev|20120820||BuildingBlock|24K||0hack1_precise_dev-20120820.pet||files missing from ubuntu precise, needed for compiling|ubuntu|precise||
+gimp-2.8.2-precise|gimp|2.8.2-precise||Graphic|32612K||gimp-2.8.2-precise.pet||Create images and edit photographs, includes babl and gegl deps, compiled by scabz -- forum 80175|ubuntu|precise||
 gnome-menus-2.14.3-up|gnome-menus|2.14.3-up||BuildingBlock|132K||gnome-menus-2.14.3-up.pet||needed by xdg_puppy, note later versions gnome-menus do not work properly|ubuntu|precise||
 gnome-menus_DEV-2.14.3-up|gnome-menus_DEV|2.14.3-up||BuildingBlock|408K||gnome-menus_DEV-2.14.3-up.pet|+gnome-menus|needed by xdg_puppy|ubuntu|precise||
 gtkhash-0.6.0-i686-up|gtkhash|0.6.0-i686-up||Utility|100K||gtkhash-0.6.0-i686-up.pet|+gtk+|GUI checksum utility|ubuntu|precise||
 gtkhash_NLS-0.6.0-i686-up|gtkhash_NLS|0.6.0-i686-up||Utility|68K||gtkhash_NLS-0.6.0-i686-up.pet||checksum utility||||
 gtk_youtube_viewer-2.05_precise|gtk_youtube_viewer|2.05_precise||Multimedia|10712K||gtk_youtube_viewer-2.05_precise.pet||A Gtk2 application to search and play Youtube videos with MPlayer. created by 666philb|puppy|precise||