Author: titmuss
Date: Thu Jul 31 14:00:54 2008
New Revision: 2748
URL: http://svn.slimdevices.com?rev=2748&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix jive revision number to include 'r' prefix.
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass?rev=2748&root=Jive&r1=2747&r2=2748&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
Thu Jul 31 14:00:54 2008
@@ -22,8 +22,7 @@
cd ${tmpdir}
md5sum zImage-P7 root.cramfs > upgrade.md5
- # FIXME version
- VERSION=${DISTRO_VERSION}_${SQUEEZEOS_REVISION}
+ VERSION=${DISTRO_VERSION}_r${SQUEEZEOS_REVISION}
# Create zip
zip ${DEPLOY_DIR_IMAGE}/jive_${VERSION}.bin *
@@ -39,6 +38,6 @@
addtask squeezeos_image after do_rootfs before do_build
squeezeos_version() {
- echo "${DISTRO_VERSION} ${SQUEEZEOS_REVISION}" >
${IMAGE_ROOTFS}/etc/squeezeos.version
+ echo "${DISTRO_VERSION} r${SQUEEZEOS_REVISION}" >
${IMAGE_ROOTFS}/etc/squeezeos.version
echo [EMAIL PROTECTED] `date` >> ${IMAGE_ROOTFS}/etc/squeezeos.version
}
Modified: 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=2748&root=Jive&r1=2747&r2=2748&view=diff
==============================================================================
--- 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.2/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Thu Jul
31 14:00:54 2008
@@ -24,6 +24,9 @@
# Build all packages to the same revision as the squeezeos-poky checkout,
based on the
# metadata revision. To get a newer build you need to do an 'svn update' in
poky first
SQUEEZEOS_REVISION = "${METADATA_REVISION}"
+
+# Don't cache srcrev to ensure we pick up new revisions
+BB_SRCREV_POLICY = "clear"
# SqueezePlay application
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=2748&root=Jive&r1=2747&r2=2748&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Thu Jul 31 14:00:54 2008
@@ -20,7 +20,7 @@
inherit autotools
-CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
+CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"r${SQUEEZEOS_REVISION}\\"'
EXTRA_OEMAKE = "all lua-lint"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
