Check-in [904fb8d4a3]
Not logged in

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

Overview

SHA1 Hash:904fb8d4a3ee791b37917eb45b858f4a59161977
Date: 2012-07-19 22:50:02
User: BarryK
Comment:this is version of woof used to build squeezed arm puppy 5.105 alpha4 for the raspberry pi

Tags And Properties
Changes

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

@@ -114,23 +114,28 @@
   mkdir -p /mnt/ram0/$LOCALTDIR
   cp -a $LOCALTIME /mnt/ram0/$LOCALTDIR/
   mkdir /mnt/ram0/etc/rc.d
   #120716 raspi: no battery-backed hardware clock, so date is wrong...
   mkdir -p /mnt/ram0/var/local/
-  [ -f /var/local/shutdown_date_saved ] && cp -a -f /var/local/shutdown_date_saved /mnt/ram0/var/local/ #created in rc.shutdown.
+  #120718 find the date...
+  HWDATE0="`hwclock --show 2>/dev/null`" #ex: Fri 29 Jun 2012 07:45:28 AM WST  -0.725833 seconds
+  if [ "$HWDATE0" = "" ];then
+   if [ -f /var/local/shutdown_date_saved ];then #see /etc/rc.d/rc.shutdown
+    HWDATE1="`cat /var/local/shutdown_date_saved`"
+   else
+    #either of these formats can set the date: '29 JUN 2012 10:00:00' '2012-06-28 16:20:08'
+    #120718 busybox date says '29 JUN 2012 10:00:00' invalid format
+    HWDATE1="`stat --format=%z /etc/DISTRO_SPECS | cut -f 1 -d '.' | cut -f 1,2 -d ' '`" #creation date of build. ex: '2012-06-28 16:20:08'
+   fi
+   HWDATE0="$HWDATE1"
+  fi
   echo "#!/bin/sh
 echo 'Now running in ramdisk, performing filesystem check of ${PDEV1}...'
 /bin/busybox mount -t proc none /proc
 HWDATE=\"\`/sbin/hwclock --show 2>/dev/null\`\" #ex: Fri 29 Jun 2012 07:45:28 AM WST  -0.725833 seconds
-if [ \"\$HWDATE\" = \"\" ];then
- if [ -f /var/local/shutdown_date_saved ];then #see /etc/rc.d/rc.shutdown
-  HWDATE=\"\`/bin/busybox cat /var/local/shutdown_date_saved\`\"
- else
-  #either of these formats can set the date: '29 JUN 2012 10:00:00' '2012-06-28 16:20:08'
-  HWDATE=\"\`/bin/busybox stat --format=%z /etc/DISTRO_SPECS | /bin/busybox cut -f 1 -d '.' | /bin/busybox cut -f 1,2 -d ' '\`\" #creation date of build. ex: '2012-06-28 16:20:08'
- fi
- /bin/busybox date -s \"\$HWDATE\"
+if [ \"${HWDATE0}\" != \"\" ];then
+ /bin/date -s \"${HWDATE0}\"
 else
  /sbin/hwclock --hctosys --localtime
 fi
 /bin/busybox umount /old_root
 if [ \$? -ne 0 ];then

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

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Squeezed Arm Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.104
+DISTRO_VERSION=5.105
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='debian'
 #Prefix for some filenames: exs: sqzdsave.2fs, sqzd-4.99.0.sfs
 DISTRO_FILE_PREFIX='sap6'
 #The version of the distro whose binary packages were used to build this distro: