Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (f1ac5b1a0f41e6960f3ecd4b501baac37554a6f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (f1ac5b1a0f41e6960f3ecd4b501baac37554a6f8)
  • Date: Wed, 10 Feb 2010 21:47:35 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/qemu/DETAILS | 2 +-
utils/qemu/HISTORY | 5 +++++
utils/qemu/PREPARE | 4 ++++
3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f1ac5b1a0f41e6960f3ecd4b501baac37554a6f8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: Check only the branch of QEMU_VER (at one point it was
0.10.6, now it's 0.10)

$ grep QEMU_VER /etc/sorcery/local/depends/qemu.p
QEMU_VER="0.10.6"

Before reverting 90aa27cc843e8ca383dc391eb9ffada24c0f2d22 and this
commit:
$ gaze version qemu
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test utils qemu - 0.10.6

After:
$ gaze version qemu
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test utils qemu 0.10.6 0.10.6

A simple `cast -r qemu` would also fix the issue without this
commit, but that is not how we treat our users.

This also migrates the (shortlived) full version in QEMU_VER to the
new branch value.

diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 4544bae..e2a9849 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -4,7 +4,7 @@ if [[ -z $QEMU_VER ]]; then
QEMU_VER="0.10"
fi

-case $QEMU_VER in
+case ${QEMU_VER:0:4} in
0.10)
VERSION=0.10.6
;;
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index f92c8ec..b2cb5a7 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2010-02-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Check only the branch of QEMU_VER (at one point it was
+ 0.10.6, now it's 0.10)
+ * PREPARE: Fix old invalid value of QEMU_TEST
+
2010-02-03 Vasil Yonkov <spirtbrat AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE: made QEMU_VER referring to
a branch, not to a concrete version
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index 267aa0c..46ed694 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,2 +1,6 @@
+if [[ ${#QEMU_VER} -eq 6 ]]; then
+ QEMU_VER=${QEMU_VER:0:4}
+fi
+
config_query_list QEMU_VER "Which branch to build?" \
0.10 0.11 0.12



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f1ac5b1a0f41e6960f3ecd4b501baac37554a6f8), Eric Sandall, 02/10/2010

Archive powered by MHonArc 2.6.24.

Top of Page