Check-in [58fc508fde]
Not logged in

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

Overview

SHA1 Hash:58fc508fde9dac242e059f5540de9f07e8750ef4
Date: 2012-08-23 11:42:09
User: BarryK
Comment:rerwin: fixes-3, precise_rerwin_fixes-3.pet, from forum t=76961&start=255

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
+brcm:brcmfmac.ko,brcmsmac.ko,bcma.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
@@ -40,11 +40,10 @@
 rt2870sta-fw:rt2870sta.ko
 rt2x00:rt2x00pci.ko,rt2x00usb.ko,rt61pci.ko,rt73usb.ko,rt2400pci.ko,rt2500pci.ko,rt2500usb.ko,rt2800pci.ko,rt2800usb.ko
 rtl_nic:r8169.ko
 rtl8188_8192su:r8192s_usb.ko
 RTL8192E:r8192e_pci.ko
-rtl8192se:rtl8192se.ko
 RTL8192U:r8192u_usb.ko
 rtlwifi:rtl8192ce.ko,rtl8192cu.ko,rtl8192se.ko,r8712u.ko
 wl:wl.ko
 zd1201_firmware:zd1201.ko
 zd1211_firmware:zd1211rw.ko

Deleted woof-code/kernel-skeleton/lib/modules/all-firmware/rtl8192se/lib/firmware/rtlwifi/rtl8192sefw.bin

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 '
+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 '

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

@@ -7,10 +7,11 @@
 #w482 variables CDRECORD and MKISOFS are exportedby rc.shutdown and savesessio-dvd.
 #w482 replace -pad in cdrecord with padsize=300k.
 #100820 relocate /var/local so it will get saved.
 #100913 simplified puppy filenames.
 #100916 no longer have DISTRO_DEVXSFS in /etc/DISTRO_SPECS.(it was only there briefly)
+#120823 rerwin: multisession: screen out /.XLOADED when save.
 
 KERNELVER="`uname -r`" #w478
 
 ##w478 compose name of 'zdrv', to fit 8+3 filename...
 #PREFIX1CHAR="`echo -n "$DISTRO_FILE_PREFIX" | cut -c 1`"
@@ -195,17 +196,19 @@
    SECT=`$CDRECORD -msinfo dev=${HDRCDR} 2>/tmp/cdrerr.txt | grep '^[0-9]*.[0-9]'`
    if [ "$SECT" = "" ];then
     SAVEABORT="$CDR" #v3.01
     break #v3.01
    else
-     waittrayclosed_func $CDR #v2.16
-    TSIZE="`$MKISOFS -print-size -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt ${MYDATE}=/initrd/pup_rw`"
+    waittrayclosed_func $CDR #v2.16
+    #TSIZE="`$MKISOFS -print-size -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt ${MYDATE}=/initrd/pup_rw`"
+    TSIZE="`$MKISOFS -print-size -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt -x /initrd/pup_rw/etc/.XLOADED ${MYDATE}=/initrd/pup_rw`" #120823
     #-J Joliet extension disabled, sometimes causes failure...
     #v2.02 added -pad ...
     waittrayclosed_func $CDR #v2.16 v3.01 now HDRCDR...
     #v2.16 removed -pad from cdrecord as mkisofs has -pad by default... no, leave for now...
-    $MKISOFS -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt ${MYDATE}=/initrd/pup_rw | $CDRECORD -multi -data -tao -eject -v speed=4 gracetime=2 padsize=300k tsize=${TSIZE}s dev=${HDRCDR} -
+    #$MKISOFS -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt ${MYDATE}=/initrd/pup_rw | $CDRECORD -multi -data -tao -eject -v speed=4 gracetime=2 padsize=300k tsize=${TSIZE}s dev=${HDRCDR} -
+    $MKISOFS -D -R -C $SECT -M $CDR -quiet -new-dir-mode 0755 -graft-points -x /initrd/pup_rw/tmp $REMSFS -x /initrd/pup_rw/proc -x /initrd/pup_rw/sys -x /initrd/pup_rw/var -x /initrd/pup_rw/initrd -x /initrd/pup_rw/mnt -x /initrd/pup_rw/etc/.XLOADED ${MYDATE}=/initrd/pup_rw | $CDRECORD -multi -data -tao -eject -v speed=4 gracetime=2 padsize=300k tsize=${TSIZE}s dev=${HDRCDR} - #120823
     [ $? -eq 0 ] && break
    fi
    echo "Cannot write to CD" > /tmp/dvderr.txt
   else #dvd
     waittrayclosed_func $CDR #v2.16

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

@@ -45,10 +45,11 @@
 #120126 jemimah: clear SELECTIONS variable, add ntfs exclusion.
 #120202 rodin.s: internationalized
 #120310 npierce: fix some grep operations.
 #120323 replace 'xmessage' with 'pupmessage'.
 #120329 Xdialog bug --yesno supposed to "yes" "No" buttons, but they are "OK" "Cancel".
+#120823 rerwin: preserve user-modified files in full-install upgrade.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=puppyinstaller
 export OUTPUT_CHARSET=UTF-8
@@ -1379,10 +1380,11 @@
     fi
    fi
    Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy Universal Installer')" --no-buttons --infobox "$(gettext 'Please wait, copying Puppy files to') $DESTPART..." 0 0 120000 &
    XPID=$!
    sleep 1
+   cp -f /etc/profile /tmp/profile-before_upgrade #120823 rerwin: preserve user-modified files in full-install upgrade.
    #loop-device mount ${DISTRO_PUPPYSFS} in DESTPART, copy contents of ${DISTRO_PUPPYSFS} to DESTPART...
    #SFSPATTERN="^${DISTRO_PUPPYSFS}" #100913
    #xSFSNAME="`ls -1 $SRCPATH/ | grep "$SFSPATTERN" | head -n 1`" #v3.01
    ##losetup-FULL /dev/loop2 $SRCPATH/${DISTRO_FILE_PREFIX}-$NEWVER.sfs
    #losetup-FULL /dev/loop2 $SRCPATH/$xSFSNAME #v3.01

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

@@ -38,10 +38,15 @@
 #110722 tweak sort.
 #110808 PANZERKOPF: bug fix. 110822 reverted.
 #120323 replace 'xmessage' with 'pupmessage'.
 #120329 Xdialog bug --yesno supposed to "yes" "No" buttons, but they are "OK" "Cancel".
 #120512 01micko: support xz compression.
+#120605 rerwin: omit /dev/snd content, /dev/.udev subdirectory and modem daemons from new master (because daemons reinstalled from firmware if needed).
+#120606 rerwin: support users' replacement of stripped /root & /etc with complete directories (for "boot disk").
+#120607 rerwin: Remove indicators/files for integrated user-installed packages.
+#120628 shinobar: no change id-string for reuse
+#120721 revert 'wildcards' option (from 120605); improve /dev/snd file exclusion; exclude /usr/share/icons/hicolor/icon-theme.cache (shinobar).
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 Yes_lbl="Yes"
 No_lbl="No"
@@ -121,11 +126,11 @@
 Click 'Yes' button to customise /etc...
 Click 'No' button not to customise (recommended)..."
 m_22="These files were customised in /etc:\n
 codepage fontmap keyboardtype keymap mousebuttons mousedevice videomode
 eth0mode eth1mode resolv.conf localtime TZ cdburnerdevice dvddevice modemdevice
-securetelnetrc modprobe.d rdesktoprc windowmanager xextraoptions X11/xorg.conf
+securetelnetrc modprobe.d/* rdesktoprc windowmanager xextraoptions X11/xorg.conf
 and directory network-wizard."
 m_23="\$MSG1
 \n\n
 If you know what you are doing, you can now modify any files in /tmp/etc
 folder. This is just about to be added to /etc in the .sfs file.\n
@@ -179,11 +184,11 @@
 m_28_1="\$WKGMNTPT/custom-puppy.iso created."
 m_28_2="ISO files not created."
 m_28="\$WKGMNTPT/puppylivecdbuild/ files left in existence.\n
 Click 'Ok' button to quit..."
 m_29="Please choose the media to burn to.\n
-The burner drive is /dev/$BURNERDRV, and obviously it must be able to burn a DVD if you want to burn a DVD!
+The burner drive is /dev/\$BURNERDRV, and obviously it must be able to burn a DVD if you want to burn a DVD!
 \n\n
 Note, you can later use the 'dd' program to create an iso file:\n
  # dd if=/dev/\$BURNERDRV of=puppy.iso seek=0 bs=32k
 \n\n
 PLEASE INSERT THE NEW CD OR DVD RIGHT NOW, THEN CHOOSE FROM MENU..."
@@ -523,12 +528,20 @@
 if [ "$MKZDRV" = "yes" ]; then
   rm -f $WKGMNTPT/puppylivecdbuild/$ZDRVSFS
   mksquashfs /lib $WKGMNTPT/puppylivecdbuild/$ZDRVSFS -keep-as-directory -e /lib/[^m]* $ANOTHER_REMOVE
   ANOTHER_REMOVE="/lib/modules"
 fi
+#120605 Omit certain /dev subdir content and modem components loaded from firmware tarballs...
+[ -d /dev/snd ] && [ "`ls /dev/snd`" != "" ] && DIRDEVSNDFILES="/dev/snd/*" #120721
+[ -d /dev/.udev ] && DIRDEVUDEV="/dev/.udev"
+[ -f /usr/sbin/slmodemd ] && SLDAEMON="/usr/sbin/slmodemd"
+[ -f /usr/sbin/martian_modem ] && MDAEMON="/usr/sbin/martian_modem"
+[ -f /usr/bin/mwavem ] && MWDAEMON="/usr/bin/mwavem /usr/share/mwavem"
+[ -f /usr/sbin/hamregistry ] && HAMREG="/usr/sbin/hamregistry"
+[ -f /usr/share/icons/hicolor/icon-theme.cache ] && ICONCACHE=/usr/share/icons/hicolor/icon-theme.cache #120721
 # display terminal only for the first stage because it takes the most of time. 'squash' is a function, see above. 120512 $COPTIONS added...
-squash / $WKGMNTPT/puppylivecdbuild/$PUPPYSFS ${COPTIONS} -e /etc /proc /initrd /var /tmp /archive /mnt /root /puppylivecdbuild $ANOTHER_REMOVE $DIRHOME $DIRSYS $DIRLOST /$PUPPYSFS
+squash / $WKGMNTPT/puppylivecdbuild/$PUPPYSFS ${COPTIONS} -e /etc /proc /initrd /var /tmp /archive /mnt /root /puppylivecdbuild $ANOTHER_REMOVE $DIRHOME $DIRSYS $DIRLOST /$PUPPYSFS $DIRDEVSNDFILES $DIRDEVUDEV $SLDAEMON $MDAEMON $MWDAEMON $HAMREG $ICONCACHE #120605 end #120721 avoid wildecards option, icon-theme.cache
 sync
 
 #add pristine folders (out of current puppy.sfs)...
 mksquashfs /initrd${PUP_LAYER}/proc $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
 sync
@@ -615,14 +628,18 @@
 #sort -u /tmp/root/.packages/woof-installed-packages > /tmp/woof-installed-packages-tmp #v431
 #mv -f /tmp/woof-installed-packages-tmp /tmp/root/.packages/woof-installed-packages
 sort -u --key=1 --field-separator="|" /tmp/root/.packages/woof-installed-packages > /tmp/woof-installed-packages-tmp #110722
 mv -f /tmp/woof-installed-packages-tmp /tmp/root/.packages/woof-installed-packages
 echo -n "" > /tmp/root/.packages/user-installed-packages #v431
+sync #120607
+rm -f /tmp/root/.packages/*.files #120607
+rm -f /tmp/root/.packages/*.remove #120607
 
 eval m_19=\"$m_19\"
 Xdialog --wrap --left --title "$m_01" --msgbox "$m_19" 0 0
 sync
+[ "`ls /tmp/root/.packages/*.files`" = "" ] && CLEARPKGLOG="yes" || CLEARPKGLOG="no" #120607 in case user copied entire /root to /tmp for boot disk.
 mksquashfs /tmp/root $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
 sync
 rm -rf /tmp/root
 #######END WORKING ON /root#######
 
@@ -704,10 +721,19 @@
 cp -f /tmp/etc/DISTRO_SPECS /tmp/DISTRO_SPECSupdated #keep this to put into initrd.gz.
 
 eval m_23=\"$m_23\"
 Xdialog --wrap --left  --title "$m_01" --msgbox "$m_23" 0 0
 
+#120606 in case user just now replaced the /etc directory...
+sync
+if [ -f /tmp/etc/.XLOADED ];then #user replaced the /etc directory
+ rm -f /tmp/etc/.XLOADED
+ rm -f /tmp/etc/modules/firmware.dep.inst.*
+ touch /tmp/etc/personal_settings_popup_disabled
+ touch /tmp/etc/personal_data_save_disabled
+fi
+
 sync
 
 
 mksquashfs /tmp/etc $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
 sync
@@ -733,10 +759,11 @@
    cp -a -f $ONEFILE /tmp$DIRNAME/
   fi
  done
 done
 sync
+[ "$CLEARPKGLOG" = "yes" ] && rm -f /tmp/var/log/packages/* #120607
 
 sync
 mksquashfs /tmp/var $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
 sync
 rm -rf /tmp/var
@@ -768,10 +795,11 @@
 eval m_25_1=\"$m_25_1\"
   Xdialog --wrap --left  --title "$m_01" --msgbox "$m_25_1" 0 0
   exit
 fi
 
+if [ "$NEW" = "yes" ]; then	#120628: no change id-string for reuse
 #100913 append id-string. doesn't matter if already have an id-string appended...
 echo -n "$IDSTRING" >> $WKGMNTPT/puppylivecdbuild/vmlinuz
 [ -f $WKGMNTPT/puppylivecdbuild/$PUPPYSFS ] && echo -n "$IDSTRING" >> $WKGMNTPT/puppylivecdbuild/$PUPPYSFS
 [ -f $WKGMNTPT/puppylivecdbuild/$ZDRVSFS ] && echo -n "$IDSTRING" >> $WKGMNTPT/puppylivecdbuild/$ZDRVSFS
 #[ -f $WKGMNTPT/puppylivecdbuild/$DEVXSFS ] && echo -n "$IDSTRING" >> $WKGMNTPT/puppylivecdbuild/$DEVXSFS
@@ -790,10 +818,11 @@
 find . | cpio -o -H newc | gzip -9 > $WKGMNTPT/puppylivecdbuild/initrd.gz
 sync
 cd ..
 rm -rf initrd-tree-tmp1
 cd /root
+fi #120628 end
 
 #build new iso file, or direct burn to cd...
 #to save space, burn direct from $WKGMNTPT/puppylivecdbuild/ to cd...
 eval m_26=\"$m_26\"
 Xdialog --wrap --left --title "$m_01" --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_26" 0 0

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

@@ -21,10 +21,11 @@
 #120327 only show "*RECOMMENDED*" partition for savefile if >256MB free.
 #120327 expBOOTDRV needs to be exported to rc.shutdown.
 #120427 01micko: support ext4 in save-file. 120428
 #120512 Karl Godt: some parameters missing from lines 626, 630, 642.
 #120514 Karl Godt: precaution, save-file must be bigger than size used in ram.
+#120823 rerwin: avoid saving personal data if flag set in /etc (by remasterpup2, file /etc/personal_data_save_disabled).
 
 if [ ! $DISPLAY ];then
  export LANG=C #110928 console shutdown using 'dialog', disable i18n.
 else
  export OUTPUT_CHARSET=UTF-8
@@ -639,26 +640,30 @@
    dialog --colors --title "$T_title" --timeout 240 --no-label "$T_no" --yes-label "$T_save" --yesno "$yesno" 0 0 >/dev/console #120512
   fi
   SAVECHOICE=$?
  ;;
  iso9660)
-  T_iso="`eval_gettext \"You have booted off a live-CD or DVD, and you can now save your personal settings and files to a USB Flash drive or any hard drive partition. The session will be saved as a single file, named '\\\${DISTRO_FILE_PREFIX}save.2fs', which has a ext2 (or ext3) filesystem inside it.
+  if [ -f /etc/personal_data_save_disabled ];then #120823 rerwin
+   SAVECHOICE=256 #120823 rerwin: do not save - case *) below
+  else #120823
+   T_iso="`eval_gettext \"You have booted off a live-CD or DVD, and you can now save your personal settings and files to a USB Flash drive or any hard drive partition. The session will be saved as a single file, named '\\\${DISTRO_FILE_PREFIX}save.2fs', which has a ext2 (or ext3) filesystem inside it.
 However, if you have burnt the CD/DVD as multisession (not closed), then sessions can be saved as additional tracks to the CD/DVD -- each saved session will appear on the CD/DVD as a directory with all the saved files in it, not as a single file. \Zb\Z1THIS IS STILL EXPERIMENTAL, AND DOES NOT WORK WITH LAPTOP OPTICAL DRIVES\Zn\ZB\"`"
-  if [ $DISPLAY ];then
-   T_display="`eval_gettext \"Click the \Zb\\\${T_savetofile}\ZB button to choose a partition to save the session as file '\\\${DISTRO_FILE_PREFIX}save.2fs'...
+   if [ $DISPLAY ];then
+    T_display="`eval_gettext \"Click the \Zb\\\${T_savetofile}\ZB button to choose a partition to save the session as file '\\\${DISTRO_FILE_PREFIX}save.2fs'...
 Click \Zb\\\${T_cd}\ZB button to save session to CD/DVD (multisession) (EXPERIMENTAL)...
 Click \Zb\\\${T_notsave}\ZB to shutdown without saving session...\"`"
-   yesno="$T_iso \n\n$T_display \n\n$T_orwait240"
-   pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --extra-button --ok-label "$T_savetofile"  --extra-label "$T_cd" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console #120512
-  else
-   T_display="`eval_gettext \"Select <\\\${T_savetofile}> (just press ENTER key) to choose a partition to save the session as file \\\${DISTRO_FILE_PREFIX}save.2fs...
+    yesno="$T_iso \n\n$T_display \n\n$T_orwait240"
+    pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --extra-button --ok-label "$T_savetofile"  --extra-label "$T_cd" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console #120512
+   else
+    T_display="`eval_gettext \"Select <\\\${T_savetofile}> (just press ENTER key) to choose a partition to save the session as file \\\${DISTRO_FILE_PREFIX}save.2fs...
 Select <\\\${T_cd}> (TAB then ENTER) to save session to CD/DVD (multisession) (EXPERIMENTAL)...
 Select <\\\${T_notsave}> to shutdown without saving session...\"`"
-   yesno="$T_iso \n\n$T_display \n\n$T_orwait240"
-   dialog --colors --title "$T_title" --timeout 240 --extra-button --ok-label "$T_savetofile"  --extra-label "$T_cd" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console
-  fi
-  SAVECHOICE=$?
+    yesno="$T_iso \n\n$T_display \n\n$T_orwait240"
+    dialog --colors --title "$T_title" --timeout 240 --extra-button --ok-label "$T_savetofile"  --extra-label "$T_cd" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console
+   fi
+   SAVECHOICE=$?
+  fi #120823
   [ "$SAVECHOICE" == "3" ] && PUPMODE=77 && SAVEPART="$PDEV1" #save to cd/dvd.
  ;;
 esac
 case $SAVECHOICE in
  0)

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

@@ -196,19 +196,17 @@
 libyahoo2-1.0.1-w5|libyahoo2|1.0.1-w5||BuildingBlock|164K||libyahoo2-1.0.1-w5.pet||yahoo chat library, used by ayttm|puppy|wary5||
 libyahoo2_DEV-1.0.1-w5|libyahoo2_DEV|1.0.1-w5||BuildingBlock|368K||libyahoo2_DEV-1.0.1-w5.pet|+libyahoo2|yahoo chat library, used by ayttm|puppy|wary5||
 linux_firewall-2.0rc9-puppy2|linux_firewall|2.0rc9-puppy2||Network|132K||linux_firewall-2.0rc9-puppy2.pet||Firewall||||
 linux_firmware_dvb-1.20|linux_firmware_dvb|1.20||BuildingBlock|48K||linux_firmware_dvb-1.20.pet||dvb usb kernel firmware||||
 linux_headers_DEV-2.6.32-40|linux_headers_DEV|2.6.32-40||BuildingBlock|4236K||linux_headers_DEV-2.6.32-40.pet||header files for 2.6.32.40 kernel||||
-linux_headers-3.2.17|linux_headers|3.2.17||BuildingBlock|4788K||linux_headers-3.2.17.pet||header files for 3.2.17 kernel||||
-linux_headers-3.2.18|linux_headers|3.2.18||BuildingBlock|4780K||linux_headers-3.2.18.pet||header files for 3.2.18 kernel||||
 linux_headers-3.2.27|linux_headers|3.2.27||BuildingBlock|4796K||linux_headers-3.2.27.pet|+linux_kernel&ge3.2.27|header files for 3.2.27 kernel||||
+linux_headers-3.2.28|linux_headers|3.2.28||BuildingBlock|4796K||linux_headers-3.2.28.pet|+linux_kernel&ge3.2.28|header files for 3.2.28 kernel||||
 linux_kernel-2.6.32-smp-45-i486-w5|linux_kernel|2.6.32-smp-45-i486-w5||BuildingBlock|83840K||linux_kernel-2.6.32-smp-45-i486-w5.pet||Linux kernel 2.6.32-smp-45 compiled in Wary Puppy version 5.1.2|puppy|wary5||
 linux_kernel-2.6.32-uni-45-i486-w5|linux_kernel|2.6.32-uni-45-i486-w5||BuildingBlock|82856K||linux_kernel-2.6.32-uni-45-i486-w5.pet||Linux kernel 2.6.32-uni-45 compiled in Wary Puppy version 5.1.2|puppy|wary5||
 linux_kernel-2.6.39-3-pae-i686-2-w5|linux_kernel|2.6.39-3-pae-i686-2-w5||BuildingBlock|65772K||linux_kernel-2.6.39-3-pae-i686-2-w5.pet||Linux kernel 2.6.39-3 compiled in Wary Puppy version 5.0|puppy|wary5||
-linux_kernel-3.2.17-pae-i686-aufs-w5|linux_kernel|3.2.17-pae-i686-aufs-w5||BuildingBlock|66064K||linux_kernel-3.2.17-pae-i686-aufs-w5.pet||Linux kernel 3.2.17 compiled in Wary Puppy version 5.1.2|puppy|wary5||
-linux_kernel-3.2.18-pae-i686-aufs-up|linux_kernel|3.2.18-pae-i686-aufs-up||BuildingBlock|65864K||linux_kernel-3.2.18-pae-i686-aufs-up.pet||Linux kernel 3.2.18 compiled in Precise Puppy version 5.2.55|ubuntu|precise||
 linux_kernel-3.2.27-pae-i686-aufs-up|linux_kernel|3.2.27-pae-i686-aufs-up||BuildingBlock|65892K||linux_kernel-3.2.27-pae-i686-aufs-up.pet||Linux kernel 3.2.27 compiled in Precise Puppy version 5.2.55|ubuntu|precise||
+linux_kernel-3.2.28-pae-i686-aufs-up|linux_kernel|3.2.28-pae-i686-aufs-up||BuildingBlock|66260K||linux_kernel-3.2.28-pae-i686-aufs-up.pet||Linux kernel 3.2.28 compiled in Precise Puppy version 5.2.55|ubuntu|precise||
 madplay-0.15.2b-w5|madplay|0.15.2b-w5||Multimedia|80K||madplay-0.15.2b-w5.pet|+libid3tag,+libmad|A MPEG audio decoder program|puppy|wary5||
 madplay_DOC-0.15.2b-w5|madplay_DOC|0.15.2b-w5||Multimedia|44K||madplay_DOC-0.15.2b-w5.pet||A MPEG audio decoder program|puppy|wary5||
 madplay_NLS-0.15.2b-w5|madplay_NLS|0.15.2b-w5||Multimedia|92K||madplay_NLS-0.15.2b-w5.pet|+madplay|A MPEG audio decoder program|puppy|wary5||
 makebootfat-1.4-patched1-1|makebootfat|1.4-patched1-1||BuildingBlock|31K||makebootfat-1.4-patched1-1.pet||formats usb drive as bootable|puppy|4||
 man_cut-1.6e|man_cut|1.6e||BuildingBlock|48K||man_cut-1.6e.pet||only has man2html from man pkg|puppy|4||

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

@@ -435,11 +435,11 @@
 yes|libxvmc|libxvmc1,libxvmc-dev|exe,dev,doc,nls| #this is actually part of xorg.
 yes|libyahoo2||exe,dev,doc,nls| #needed by ayttm.
 yes|linux_firewall||exe
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
-yes|linux_headers|linux_headers-3.2.27*|exe>dev,dev,doc,nls|pet:
+yes|linux_headers|linux_headers-3.2.28*|exe>dev,dev,doc,nls|pet:
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
 no|llvm|libllvm3.0|exe,dev,doc,nls| #needed by libgl1-mesa-dri, but huge 7MB deb. i left out dev components. 120605 removed.
 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

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

@@ -7,9 +7,9 @@
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro:
 DISTRO_COMPAT_VERSION='precise'
 #the kernel pet package used:
-DISTRO_KERNEL_PET='linux_kernel-3.2.27-pae-i686-aufs-up.pet'
+DISTRO_KERNEL_PET='linux_kernel-3.2.28-pae-i686-aufs-up.pet'
 #read by /usr/bin to bypass Xorg Wizard at first boot:
 DISTRO_XORG_AUTO='yes'
 DISTRO_TARGETARCH='x86'