From e4914373b9b2e9ca5f161e42dfc38762ea42c795 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Sat, 4 Apr 2009 21:56:57 +0200
Subject: [PATCH] add Versionsinformations to builded images

---
 config/path                    |  5 +++--
 packages/virtual/image/install | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/path b/config/path
index a9fe1200f9..b34b8c44b9 100644
--- a/config/path
+++ b/config/path
@@ -8,7 +8,7 @@ TARGET_NAME=$TARGET_FAMILY-linux-uclibc
 #determines TARGET_CPU, if not forced by user
 TARGET_CPU=generic
 
-GEEXBOX_VERSION=`cat VERSION`
+OPENELEC_VERSION=`cat VERSION`
 CONFIG=config
 SCRIPTS=scripts
 PACKAGES=packages
@@ -164,7 +164,8 @@ fi
 INDENT_SIZE=4
 
 GEEXBOX_SRCS=http://www.geexbox.org/src/$GEEXBOX_VERSION
-[ "$GEEXBOX_VERSION" = devel ] && GEEXBOX_VERSION=$GEEXBOX_VERSION-`date +%Y%m%d` #-r`hg tip --template={rev}`
+#[ "$GEEXBOX_VERSION" = devel ] && GEEXBOX_VERSION=$GEEXBOX_VERSION-`date +%Y%m%d` #-r`hg tip --template={rev}`
+[ "$OPENELEC_VERSION" = devel ] && OPENELEC_VERSION=$OPENELEC_VERSION-`date +%Y%m%d`-r`bzr version-info --custom --template={revno}`
 [ -n "$GEEXBOX_VERSION_EXTRA" ] && GEEXBOX_VERSION=$GEEXBOX_VERSION-$GEEXBOX_VERSION_EXTRA
 
 VERSION_SUFFIX=$TARGET_ARCH
diff --git a/packages/virtual/image/install b/packages/virtual/image/install
index 27fb529594..ddadecab2f 100755
--- a/packages/virtual/image/install
+++ b/packages/virtual/image/install
@@ -85,28 +85,28 @@ case "$2" in
     ln -sf /var/mnt $INSTALL/mnt
 
     mkdir -p $ROOT/target
-      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER.kernel
-      cp build.$PROJECT.*/linux-*/arch/x86/boot/bzImage $ROOT/target/$PROJECT-$MEDIACENTER.kernel
+      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.kernel
+      cp build.$PROJECT.*/linux-*/arch/x86/boot/bzImage $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.kernel
     
-      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER.$2
-      $ROOT/$TOOLCHAIN/bin/mksquashfs $INSTALL $ROOT/target/$PROJECT-$MEDIACENTER.$2 -noappend -all-root
+      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.$2
+      $ROOT/$TOOLCHAIN/bin/mksquashfs $INSTALL $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.$2 -noappend -all-root
 #     $ROOT/$TOOLCHAIN/bin/mkfs.axfs $INSTALL openelec.$2
   ;;
 
   img)
     mkdir -p $ROOT/target
-      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash
-      qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash 50M
-      /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash
+      rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash
+      qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash 50M
+      /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash
 
     mkdir -p $ROOT/.tmp
-      sudo mount -o loop $ROOT/target/$PROJECT-$MEDIACENTER-qemu.flash $ROOT/.tmp
-      cp -R $ROOT/target/$PROJECT-$MEDIACENTER.system $ROOT/.tmp
+      sudo mount -o loop $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash $ROOT/.tmp
+      cp -R $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.system $ROOT/.tmp
       sudo umount $ROOT/.tmp
 
-    rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store
-    qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store 40M
-    /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-qemu.store
+    rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.store
+    qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.store 40M
+    /sbin/mkfs.ext3 -L OpenELEC -F $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.store
 
   ;;