Check-in [2a7963fd95]
Not logged in

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

Overview

SHA1 Hash:2a7963fd956214b13fd4525e016d031b3746ddaf
Date: 2012-05-27 01:48:23
User: BarryK
Comment:small mod, maybe temporary, to sync with shinobar sfs_load

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -111,10 +111,11 @@
 #120506b check that sd card big enough.
 #120510 offer to resize 2nd partition of SD card to fill card.
 #120521 for SD-image build, copy-only console fonts and keyboard layouts to initrd, copy-only kernel modules to initrd.
 #120522 precise puppy, seamonkey was crashing. needed /usr/share/glib-2.0/schemas/apps.gecko-mediaplayer.preferences, also must be compiled.
 #120523 precise puppy, may also need to run gio-querymodules. (refer also installpkg.sh, rc.update)
+#120526 try radeon kms default on.
 
 #v431 accepts passed params, from woof_gui_tabs:
 #$1=$CHOICE_KERNELPKG $2=$CHOICE_SCSI $3=$CHOICE_BIGMODEM $4=$CHK_FB_STATE $5=$CHK_EXOTIC_STATE $6=$CHK_RADICAL_STATE
 #100912 add $7=CHK_SIMPLE_FILENAMES
 
@@ -2166,11 +2167,11 @@
  echo "Press ENTER key only to accept the default, any other char to flip:"
  for XDRIVER in i915 radeon nouveau
  do
   KMSFLG='1'
   #[ "$XDRIVER" = "radeon" ] && [ "$DISTRO_BINARY_COMPAT" = "slackware" ] && KMSFLG='0' #01micko.
-  [ "$XDRIVER" = "radeon" ] && KMSFLG='0' #110918 seems need this off.
+  #[ "$XDRIVER" = "radeon" ] && KMSFLG='0' #110918 seems need this off. 120526 try default on.
   echo -n "${XDRIVER} [${KMSFLG}]: "
   read KMSREPLY
   if [ "$KMSREPLY" ];then #110906 fix syntax error.
    #not the default...
    case $KMSFLG in

Changes to woof-code/packages-templates/audiofile/FIXUPHACK

@@ -1,1 +1,3 @@
 
+#120526 precise pangolin
+[ ! -e usr/lib/libaudiofile.so.0 ] && ln -s libaudiofile.so.1 usr/lib/libaudiofile.so.0

Changes to woof-code/packages-templates/audiofile/usr/lib/PLUSEXTRADIRS


Changes to woof-code/packages-templates/audiofile/usr/lib/PLUSEXTRAFILES


Deleted woof-code/packages-templates/audiofile/usr/lib/libaudiofile.so.0

Deleted woof-code/packages-templates/audiofile/usr/lib/libaudiofile.so.0.0.2

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

@@ -38,10 +38,11 @@
 #111011 now using pupdialog instead of Xdialog for sfs chooser.
 #111015 support kernel 3.x.
 #111113 roll back to Xdialog for sfs chooser. pupdialog limited items, some people have 100s sfs's.
 #120201 rodin.s: internationalized.
 #120323 replace 'xmessage' with 'pupmessage'.
+#120527 shinobar's sfs-load on-the-fly pet has /etc/rc.d/BOOTCONFIG.save, sync it...
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=bootmanager
 export OUTPUT_CHARSET=UTF-8
@@ -284,11 +285,17 @@
  RETTAGS="`echo -n "$RETTAGS" | sed -e 's/ $//g'`"
 
  [ ! -e /etc/rc.d/BOOTCONFIG ] && touch /etc/rc.d/BOOTCONFIG
  grep -v 'EXTRASFSLIST' /etc/rc.d/BOOTCONFIG > /tmp/BOOTCONFIG
  cat /tmp/BOOTCONFIG > /etc/rc.d/BOOTCONFIG
- echo "EXTRASFSLIST='$RETTAGS'" >> /etc/rc.d/BOOTCONFIG
+ echo "EXTRASFSLIST='${RETTAGS}'" >> /etc/rc.d/BOOTCONFIG
+
+ #120527 shinobar's sfs-load on-the-fly pet has this, sync it...
+ if [ -f /etc/rc.d/BOOTCONFIG.save ];then
+  bPTN="s%^EXTRASFSLIST=.*%EXTRASFSLIST='${RETTAGS}'%"
+  sed -i -e "$bPTN" /etc/rc.d/BOOTCONFIG.save
+ fi
 
 } #end extrasfs_func
 
 blacklist_func() {
  #blacklisting of modules at bootup.

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

@@ -133,12 +133,14 @@
 
    #120525 take into account shinobar's load-on-the-fly pet...
    if [ "`which sfs_load`" != "" ];then
     SFSMSG1a="$(eval_gettext "You can choose to mount the \${imgFileBASE} file to view it's contents (read-only), or you can install it.")" #'geany
     SFSMSG1b="${SFSMSG1a}\n\n$(gettext 'Regarding the latter, traditionally SFS files are selected by the \ZbBootManager\ZB for loading at bootup (see System menu), which you can do, or you can choose to install (load) it now (which will not require a reboot).\n\nNote1: If you want to edit the contents of an SFS file, you have to use the commandline utilities \Zbunsquashfs\ZB and \Zbmksquashfs\ZB.\nNote2: In the case of a full HD installation, without a layered filesystem, installation is irreversible. For all other installation modes, the BootManager can be used to unload an installed (loaded) SFS file.')"
-    pupdialog --colors --background '#FFFF80' --backtitle "${imgFileBASE}" --yes-label "$(gettext 'View contents')" --no-label "$(gettext 'Install SFS')"  --yesno "${SFSMSG1b}" 0 0
-    [ $? -eq 1 ] && exec sfs_load "$1"
+    pupdialog --colors --background '#FFFF80' --backtitle "${imgFileBASE}" --extra-button --yes-label "$(gettext 'View contents')" --no-label "$(gettext 'Install SFS')" --extra-label "$(gettext 'Cancel')"  --yesno "${SFSMSG1b}" 0 0
+    RETVAL=$?
+    [ $RETVAL -eq 1 ] && exec sfs_load "$1"
+    [ $RETVAL -ne 0 ] && exit #120527
    fi
 
   fi
 
 #  echo -e "\nimgFile = $imgFile\t\tExt  = $Ext"

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

@@ -90,10 +90,11 @@
 pwallpaper-1.1.2-1|pwallpaper|1.1.2-1||Desktop|72K||pwallpaper-1.1.2-1.pet|+gtk+|Set backdrop image||||
 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||||
 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.5|sfs_load|1.9.5||Setup|196K||sfs_load-1.9.5.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||||
 snap2-4.21|snap2|4.21||Utility|152K||snap2-4.21.pet|+rsync|Snap2 snapshot backup||||
 ssh_gui-0.7.1-1-p4|ssh_gui|0.7.1-1-p4||Internet|40K||ssh_gui-0.7.1-1-p4.pet|+gtk+,+openssh_client|secure telnet gui|puppy|4||
 usb-modeswitch-data-20111023|usb-modeswitch-data|20111023||BuildingBlock|892K||usb-modeswitch-data-20111023.pet||data for usb-modeswitch pkg||||

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

@@ -596,10 +596,11 @@
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe
 yes|sfs-converter||exe
+yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-base|sgml-base|exe>dev,dev,doc,nls
 yes|sgml-data|sgml-data|exe>dev,dev,doc,nls
 yes|shared-mime-info||exe,dev
 no|smplayer||exe,dev,doc,nls

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -166,11 +166,11 @@
 id3lib-3.8.3|id3lib|3.8.3||BuildingBlock|380K||id3lib-3.8.3.pet||id3 tags|puppy|4||
 ifplugd-0.28-static|ifplugd|0.28-static||BuildingBlock|136K||ifplugd-0.28-static.pet||detect network active, compiled statically||||
 ifplugd_old-0.18-1|ifplugd_old|0.18-1||BuildingBlock|20K||ifplugd_old-0.18-1.pet|+libdaemon|detect alive network|puppy|4||
 inkscapelite-0.36.3-no_gnomeprint-q1|inkscapelite|0.36.3-no_gnomeprint-q1||Graphic|1776K||inkscapelite-0.36.3-no_gnomeprint-q1.pet|+gtk+|InkLite vector editor|t2|8.0rc||
 inotail-0.5|inotail|0.5||BuildingBlock|16K||inotail-0.5.pet||tail utility uses inotify, essential|puppy|4||
-installwatch-0.6.3|installwatch|0.6.3||BuildingBlock|14K||installwatch-0.6.3.pet||essential, used by petget|puppy|4||
+installwatch-0.7-i486|installwatch|0.7-i486||BuildingBlock|14K||installwatch-0.7-i486.pet||package installation monitor, essential, used by petget||||
 isomaster-1.3.6-q1|isomaster|1.3.6-q1||Multimedia|224K||isomaster-1.3.6-q1.pet|+gtk+|ISOMaster iso file editor|t2|8.0rc||
 jimtcl-0.70|jimtcl|0.70||BuildingBlock|152K||jimtcl-0.70.pet||tiny Tcl interpreter, compiled in wary should work all puppies. note, used by usb-modeswitch||||
 jwm2-574-w5c|jwm2|574-w5c||Desktop|224K||jwm2-574-w5c.pet|+fribidi|joes window manager and tray, compiled in wary 5.2 but should run anywhere|puppy|wary5||
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||

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

@@ -418,10 +418,11 @@
 yes|linux_firewall||exe
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|linux_headers||exe>dev,dev,doc,nls
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
+yes|llvm|libllvm3.0|exe,dev,doc,nls| #needed by libgl1-mesa-dri, but huge 7MB deb. i left out dev components.
 yes|lsb-base|lsb-base|exe,dev,doc,nls
 no|lxpanel||exe,dev>null,doc,nls
 yes|lzma|lzma,lzma-dev|exe,dev,doc,nls
 yes|lzo2|liblzo2-2,liblzo2-dev|exe,dev,doc,nls
 yes|m4|m4|exe>dev,dev,doc,nls
@@ -598,10 +599,11 @@
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe
 yes|sfs-converter||exe
+yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-base|sgml-base|exe>dev,dev,doc,nls
 yes|sgml-data|sgml-data|exe>dev,dev,doc,nls
 yes|shared-mime-info||exe,dev
 no|smplayer||exe,dev,doc,nls