Author: titmuss
Date: Mon Jul 21 05:45:55 2008
New Revision: 2722
URL: http://svn.slimdevices.com?rev=2722&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix 7.1 jive build.
Thanks to schiegl on the forums.
Modified:
7.1/trunk/squeezeos/src/Makefile
7.1/trunk/squeezeos/src/scripts/mkversion
Modified: 7.1/trunk/squeezeos/src/Makefile
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/Makefile?rev=2722&root=Jive&r1=2721&r2=2722&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/Makefile (original)
+++ 7.1/trunk/squeezeos/src/Makefile Mon Jul 21 05:45:55 2008
@@ -69,7 +69,7 @@
# Create upgrade.md5
cd ${IMAGEDIR} && md5sum zImage-P7 root.cramfs > upgrade.md5
# Create jive.bin
- VERSION=`cat ${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | cut -sd\"
-f 2 | sed -e 's/ /_/'` && cd ${IMAGEDIR} && echo $$VERSION && zip
${IMAGEDIR}/jive_$$VERSION.bin jive.version upgrade.md5 zImage-P7 root.cramfs
+ SPREL=`cat ${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_RELEASE" | cut -sd\" -f 2` && SPREV=`cat
${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_REVISION" | cut -sd\" -f 2` && VERSION=`cat
${SQUEEZEPLAY_SRC}/squeezeplay/src/version.h | grep "JIVE_VERSION" | sed -e
"s/SQUEEZEPLAY_RELEASE/$$SPREL/" -e "s/SQUEEZEPLAY_REVISION/$$SPREV/" | tr -d
\" | cut -d" " -f3,4 | sed -e 's/ /_/'` && cd ${IMAGEDIR} && echo $$VERSION &&
zip ${IMAGEDIR}/jive_$$VERSION.bin jive.version upgrade.md5 zImage-P7
root.cramfs
@cat ${IMAGEDIR}/jive.version
Modified: 7.1/trunk/squeezeos/src/scripts/mkversion
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/scripts/mkversion?rev=2722&root=Jive&r1=2721&r2=2722&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/scripts/mkversion (original)
+++ 7.1/trunk/squeezeos/src/scripts/mkversion Mon Jul 21 05:45:55 2008
@@ -5,6 +5,8 @@
expr 0`cat .version` + 1 > .version
fi
-cat ../../squeezeplay/src/squeezeplay/src/version.h | cut -sd\" -f 2
+SPREL=`cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_RELEASE" | cut -sd\" -f 2`
+SPREV=`cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "define
SQUEEZEPLAY_REVISION" | cut -sd\" -f 2`
+cat ../../squeezeplay/src/squeezeplay/src/version.h | grep "JIVE_VERSION" |
sed -e "s/SQUEEZEPLAY_RELEASE/$SPREL/" -e "s/SQUEEZEPLAY_REVISION/$SPREV/" | tr
-d \" | cut -d" " -f3,4
echo [EMAIL PROTECTED] \#`cat .version` `date`
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
