Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (2ff9d4964380603dc64ca95ce43aba9dcdd90657)
  • Date: Wed, 13 Sep 2006 19:43:00 -0500

GIT changes to master grimoire by Eric Sandall <sandalle@moby.(none)>:

utils/qemu/BUILD | 13 +++++++------
utils/qemu/CONFLICTS | 1 -
utils/qemu/DEPENDS | 11 +++++++++--
utils/qemu/DETAILS | 6 +++---
utils/qemu/HISTORY | 8 +++++++-
utils/qemu/PRE_BUILD | 2 +-
6 files changed, 27 insertions(+), 14 deletions(-)

New commits:
commit 2ff9d4964380603dc64ca95ce43aba9dcdd90657
Author: Eric Sandall <sandalle@moby.(none)>
Commit: Eric Sandall <sandalle@moby.(none)>

Cleaned up qemu to work with the reworked kqemu package

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 937e0a1..7ad24fc 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,9 +1,10 @@
message "Target list:$QEMU_ARCHS" &&

- ./configure --build=$BUILD \
---prefix=/usr \
---sysconfdir=/etc \
---localstatedir=/var \
---target-list="$QEMU_ARCHS" \
-$OPTS &&
+./configure --build=$BUILD \
+ --prefix=$INSTALL_ROOT/usr \
+ --sysconfdir=$INSTALL_ROOT/etc \
+ --localstatedir=$INSTALL_ROOT/var \
+ --target-list="$QEMU_ARCHS" \
+ $OPTS &&
+
make
diff --git a/utils/qemu/CONFLICTS b/utils/qemu/CONFLICTS
deleted file mode 100755
index aa101d6..0000000
--- a/utils/qemu/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kqemu
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 15998f9..570b58a 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,2 +1,9 @@
-depends sdl &&
-depends gcc34
+depends gcc34 &&
+depends sdl &&
+
+optional_depends alsa-lib \
+ '--enable-alsa' \
+ '--disable-alsa' \
+ 'for Advanced Linux Sound Architecture driver support' &&
+
+optional_depends kqemu '' '' 'for kernel acceleration support'
'z-rejected'
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 34b7269..005e3ec 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -4,12 +4,12 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://fabrice.bellard.free.fr/qemu/$SOURCE

SOURCE_HASH=sha512:e3e3bffb9858014fd4342680779475a5b012711b2bd9c1d94cdf7579860282a4b5e60a1eaaedb981d27a315055fb00f7239ccf275a7ddc3a1bd512087a37d575
- WEB_SITE=http://fabrice.bellard.free.fr/qemu
- ENTERED=20051102
- LICENSE[0]=GPL/LGPL
DISTCC_HOSTS=
GCC_VERSION=3.4
+ LICENSE[0]=GPL/LGPL
+ WEB_SITE=http://fabrice.bellard.free.fr/qemu
KEYWORDS="emulator utils"
+ ENTERED=20051102
SHORT="QEMU is a generic and open source processor emulator"
cat << EOF
QEMU achieves a good emulation speed by using dynamic translation.
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 40f829b..7148703 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,9 @@
+2006-09-13 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Optionally depends on kqemu for acceleration kernel module
+ Optionally depends on alsa-lib
+ * CONFLICTS: No longer conflicts with qemu
+ * BUILD: Use INSTALL_ROOT
+
2006-08-19 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: Updated to 0.8.2

@@ -13,7 +19,7 @@
* BUILD: removed invoke_gcc
* PRE_BUILD: created for invoke_gcc
* CONFIGURE: added query for unattended processing, #10732
- thanks to Andreas van Ruth for the initial patch
+ thanks to Andreas van Ruth for the initial patch

2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index 900e347..5750a71 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -1,2 +1,2 @@
-default_pre_build &&
+default_pre_build &&
invoke_gcc



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (2ff9d4964380603dc64ca95ce43aba9dcdd90657), Eric Sandall, 09/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page