Author: titmuss
Date: Thu Jul 17 09:22:39 2008
New Revision: 2713
URL: http://svn.slimdevices.com?rev=2713&root=Jive&view=rev
Log:
Bug: N/A
Description:
Add squeezeos.version file in the build.
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/images/squeezeos-image-boot.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=2713&root=Jive&r1=2712&r2=2713&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 17 09:22:39 2008
@@ -16,7 +16,7 @@
md5sum zImage-P7 root.cramfs > upgrade.md5
# FIXME version
- VERSION=${DISTRO_VERSION}_${DATETIME}
+ VERSION=${DISTRO_VERSION}_${SQUEEZEOS_REVISION}
# Create zip
zip ${DEPLOY_DIR_IMAGE}/jive_${VERSION}.bin *
@@ -30,3 +30,8 @@
}
addtask squeezeos_image after do_rootfs before do_build
+
+squeezeos_version() {
+ echo "${DISTRO_VERSION} ${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=2713&root=Jive&r1=2712&r2=2713&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
17 09:22:39 2008
@@ -1,24 +1,26 @@
[EMAIL PROTECTED]: Distribution
[EMAIL PROTECTED]: SqueezeOS
[EMAIL PROTECTED]: Distribution configuration for SqueezeOS
[EMAIL PROTECTED]: Logitech SqueezeOS Linux
[EMAIL PROTECTED]: Distribution configuration for Logitech SqueezeOS Linux
require conf/distro/poky.conf
DISTRO = "squeezeos"
DISTRO_NAME = "Logitech SqueezeOS Linux"
+
DISTRO_VERSION = "7.2"
-#DISTRO_VERSION = "7.2+snapshot-${DATE}"
+SQUEEZEOS_REVISION = "${DATETIME}"
MAINTAINER = "Logitech SqueezeOS <[EMAIL PROTECTED]>"
+# Mirror site for cvs/svn/git packages
+# FIXME!
CVS_TARBALL_STASH = ""
DISTRO_FEATURES = "alsa usbgadget usbhost wifi nfs zeroconf"
# SqueezeOS/SqueezePlay SCM
-SQUEEZEOS_SVN = "svn://svn.slimdevices.com/repos/jive/7.2/trunk/squeezeos/src/"
-SQUEEZEPLAY_SCM =
"svn://svn.slimdevices.com/repos/jive/7.2/trunk/squeezeplay/src;proto=http"
-
+SQUEEZEOS_SVN =
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeos/src/"
+SQUEEZEPLAY_SCM =
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeplay/src;proto=http"
# Versions
SRCREV_pn-libsdl-image = "${AUTOREV}"
Modified:
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image-boot.bb
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image-boot.bb?rev=2713&root=Jive&r1=2712&r2=2713&view=diff
==============================================================================
---
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image-boot.bb
(original)
+++
7.2/trunk/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image-boot.bb
Thu Jul 17 09:22:39 2008
@@ -15,3 +15,10 @@
# remove not needed ipkg informations
ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files"
+IMAGE_PREPROCESS_COMMAND += "squeezeos_version"
+
+# write squeezeos.version file
+do_rootfs_prepend() {
+ echo "${DISTRO_VERSION} ${DATETIME}"
+
+}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
