Author: titmuss
Date: Wed Apr 30 06:03:13 2008
New Revision: 2397
URL: http://svn.slimdevices.com?rev=2397&root=Jive&view=rev
Log:
Bug: 6975
Description:
Rename /etc/jive.version to /etc/squeezeos.version.
Modified:
7.1/trunk/squeezeos/src/Makefile
7.1/trunk/squeezeos/src/system/filesystem/linuxrc
Modified: 7.1/trunk/squeezeos/src/Makefile
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/Makefile?rev=2397&root=Jive&r1=2396&r2=2397&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/Makefile (original)
+++ 7.1/trunk/squeezeos/src/Makefile Wed Apr 30 06:03:13 2008
@@ -54,8 +54,8 @@
#
image: ${IMAGEDIR}
# Bump version number
- scripts/mkversion > ${BUILDDIR}/etc/jive.version
- cp ${BUILDDIR}/etc/jive.version ${IMAGEDIR}/jive.version
+ scripts/mkversion > ${BUILDDIR}/etc/squeezeos.version
+ cp ${BUILDDIR}/etc/squeezeos.version ${IMAGEDIR}/jive.version
# Copy files for cramfs
-rm -rf ${STAGE}
mkdir -p ${STAGE}
Modified: 7.1/trunk/squeezeos/src/system/filesystem/linuxrc
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/linuxrc?rev=2397&root=Jive&r1=2396&r2=2397&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/linuxrc (original)
+++ 7.1/trunk/squeezeos/src/system/filesystem/linuxrc Wed Apr 30 06:03:13 2008
@@ -27,7 +27,7 @@
/bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
else
# Upgraded?
- /usr/bin/diff -N /etc/jive.version /mnt/storage/etc/jive.version >
/dev/null 2> /dev/null
+ /usr/bin/diff -N /etc/squeezeos.version
/mnt/storage/etc/squeezeos.version > /dev/null 2> /dev/null
if [ $? -ne 0 ]
then
# Remove modified files
@@ -35,7 +35,7 @@
/usr/bin/find /mnt/storage/ -type f | /bin/grep -v -f
/etc/keep-after-upgrade | /usr/bin/xargs /bin/rm -f
fi
- cp /etc/jive.version /mnt/storage/etc/jive.version
+ cp /etc/squeezeos.version /mnt/storage/etc/squeezeos.version
fi
# Mount overlay filesystem
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
