Skip to Content.
Sympa Menu

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

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 (7d1a36fc60f13b9967ada36f66f49301b931cfc1)
  • Date: Tue, 25 Oct 2011 16:27:58 -0500

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

utils/qemu/CONFIGURE | 10 +++++--
utils/qemu/HISTORY | 5 +++
utils/qemu/PRE_BUILD | 4 ++
utils/qemu/archs | 71
+++++++++++++++++++++-----------------------------
utils/qemu/archs-0.15 | 41 ++++++++++++++++++++++++++++
5 files changed, 88 insertions(+), 43 deletions(-)

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

qemu: 0.15 adds new architectures not valid for earlier versions

commit 15c23933233d8a82c44f3e6e4c1272daa06465da
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: cflags.patch is only for 0.15+

diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 092b75f..ecf3292 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,6 +1,12 @@
. "$GRIMOIRE/FUNCTIONS" &&

-local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
+if is_version_less $QEMU_VER 0.15; then
+ local QEMU_ARCH_FILE=archs
+else
+ local QEMU_ARCH_FILE=archs-0.15
+fi &&
+
+local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/$QEMU_ARCH_FILE` &&
persistent_add QEMU_ARCHS &&

# deliberately uses query, see locale CONFIGURE note
@@ -18,7 +24,7 @@ if query "Handpick architectures to emulate (y/n)?" n; then
fi &&

if [[ -z $QEMU_ARCHS ]]; then
- QEMU_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
+ QEMU_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/$QEMU_ARCH_FILE | sed -e 's/^/"/'
-e 's/\s*$/"/' | tr '\n' ' ')
fi

. $GRIMOIRE/config_query_multi.function &&
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index f172d4e..2c0d981 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2011-10-25 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: cflags.patch is only for 0.15+
+ * CONFIGURE: 0.15 adds new architectures not valid for earlier
versions
+ * archs,archs-0.15: Split into pre-0.15 and 0.15+ versions
+
2011-10-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15.1

diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index 50f9e7a..428663f 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/cflags.patch"
+if [[ "${QEMU_VER:0:4}" == "0.15" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/cflags.patch"
+fi
diff --git a/utils/qemu/archs b/utils/qemu/archs
index a062278..1b295fe 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,41 +1,32 @@
-alpha-linux-user alpha on
-armeb-linux-user armeb on
-arm-linux-user arm on
-cris-linux-user cris on
-i386-linux-user i386 on
-m68k-linux-user m68k on
-microblazeel-linux-user microblazeel on
-microblaze-linux-user microblaze on
-mipsel-linux-user mipsel on
-mips-linux-user mips on
-ppc64abi32-linux-user ppc64abi32 on
-ppc64-linux-user ppc64 on
-ppc-linux-user ppc on
-s390x-linux-user s390x on
-sh4eb-linux-user sh4eb on
-sh4-linux-user sh4 on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sparc-linux-user sparc on
-unicore32-linux-user unicore32 on
-x86_64-linux-user x86_64 on
-arm-softmmu arm-softmmu on
-cris-softmmu cris-softmmu on
-i386-softmmu i386-softmmu on
-lm32-softmmu lm32-softmmu on
-m68k-softmmu m68k-softmmu on
-microblazeel-softmmu microblazeel-softmmu on
-microblaze-softmmu microblaze-softmmu on
+alpha-linux-user alpha on
+i386-linux-user i386 on
+arm-linux-user arm on
+armeb-linux-user armeb on
+cris-linux-user cris on
+m68k-linux-user m68k on
+mips-linux-user mips on
+mipsel-linux-user mipsel on
+ppc-linux-user ppc on
+ppc64-linux-user ppc64 on
+ppc64abi32-linux-user ppc64abi32 on
+sparc-linux-user sparc on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb on
+x86_64-linux-user x86_64 on
+i386-softmmu i386-sofmmu on
+ppc-softmmu ppc-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc64-softmmu ppc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
+mips-softmmu mips-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips64-softmmu mips64-softmmu on
mips64el-softmmu mips64el-softmmu on
-mips64-softmmu mips64-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips-softmmu mips-softmmu on
-ppc64-softmmu ppc64-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc-softmmu ppc-softmmu on
-s390x-softmmu s390x-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
-sh4-softmmu sh4-softmmu on
-sparc64-softmmu sparc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
+arm-softmmu arm-softmmu on
+m68k-softmmu m68k-softmmu on
+cris-softmmu cris-softmmu on
+sh4-softmmu sh4-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
diff --git a/utils/qemu/archs-0.15 b/utils/qemu/archs-0.15
new file mode 100644
index 0000000..a062278
--- /dev/null
+++ b/utils/qemu/archs-0.15
@@ -0,0 +1,41 @@
+alpha-linux-user alpha on
+armeb-linux-user armeb on
+arm-linux-user arm on
+cris-linux-user cris on
+i386-linux-user i386 on
+m68k-linux-user m68k on
+microblazeel-linux-user microblazeel on
+microblaze-linux-user microblaze on
+mipsel-linux-user mipsel on
+mips-linux-user mips on
+ppc64abi32-linux-user ppc64abi32 on
+ppc64-linux-user ppc64 on
+ppc-linux-user ppc on
+s390x-linux-user s390x on
+sh4eb-linux-user sh4eb on
+sh4-linux-user sh4 on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sparc-linux-user sparc on
+unicore32-linux-user unicore32 on
+x86_64-linux-user x86_64 on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblazeel-softmmu microblazeel-softmmu on
+microblaze-softmmu microblaze-softmmu on
+mips64el-softmmu mips64el-softmmu on
+mips64-softmmu mips64-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips-softmmu mips-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc-softmmu ppc-softmmu on
+s390x-softmmu s390x-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
+sh4-softmmu sh4-softmmu on
+sparc64-softmmu sparc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7d1a36fc60f13b9967ada36f66f49301b931cfc1), Eric Sandall, 10/25/2011

Archive powered by MHonArc 2.6.24.

Top of Page