xorg: Changes to 'ubuntu'
debian/changelog | 11 +++++++++--
debian/local/dexconf | 23 +++++++++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit d25873ccfe629b96060582dc29affab3a9f73fd3
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Jan 29 12:40:03 2008 +0200
Prepare the changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 48f13ce..a82173c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.3+10ubuntu4) UNRELEASED; urgency=low
+xorg (1:7.3+10ubuntu4) hardy; urgency=low
* failsafeDexconf: Update mouse section.
- Don't try to use removed debconf keys.
- Make the section identical with the normal dexconf.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 29 Jan 2008 12:22:29 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 29 Jan 2008 12:29:02 +0200
xorg (1:7.3+10ubuntu3) hardy; urgency=low
commit 15614f61ce5052bfe726f6d7ce1ede08e14d2d67
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Jan 29 12:28:55 2008 +0200
dexconf: Add customizations to detect if running in KVM environment
diff --git a/debian/changelog b/debian/changelog
index ed360ce..48f13ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-xorg (1:7.3+10ubuntu3) UNRELEASED; urgency=low
+xorg (1:7.3+10ubuntu4) UNRELEASED; urgency=low
* failsafeDexconf: Update mouse section.
- Don't try to use removed debconf keys.
- Make the section identical with the normal dexconf.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 10 Jan 2008 14:05:21 +0200
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 29 Jan 2008 12:22:29 +0200
+
+xorg (1:7.3+10ubuntu3) hardy; urgency=low
+
+ * dexconf: Add customizations to detect if running in KVM environment
+ (CPU = "QEMU") and specify the H/V rates, DefaultDepth, etc.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 24 Jan 2008 17:31:15 +0000
xorg (1:7.3+10ubuntu2) hardy; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 33f3da1..c6d6258 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -241,6 +241,12 @@ db_get xserver-$SERVER/config/device/bus_id
DEVICE_BUSID="$RET"
db_get xserver-$SERVER/config/device/use_fbdev
DEVICE_USE_FBDEV="$RET"
+
+QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true)
+if [ -n "$QEMU_KVM" ]; then
+ DEVICE_DRIVER="cirrus"
+fi
+
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
Section "Device"
@@ -267,6 +273,13 @@ exec 4>"$DEXCONFTMPDIR/Monitor"
cat >&4 <<SECTION
Section "Monitor"
Identifier "Configured Monitor"
+SECTION
+
+if [ -n "$QEMU_KVM" ]; then
+ printf "\tHorizSync\t30-70\n" >&4
+ printf "\tVertRefresh\t50-160\n" >&4
+fi
+cat >&4 <<SECTION
EndSection
SECTION
@@ -281,6 +294,16 @@ SECTION
if [ -n "$PS3_FB" ]; then
printf "\tDefaultFbBpp 32\n" >&4
fi
+if [ -n "$QEMU_KVM" ]; then
+cat >&4 <<SUBSECTION
+ Device "Configured Video Device"
+ DefaultDepth 24
+ SubSection "Display"
+ Depth 24
+ Modes "1280x800" "1152x768" "1024x768" "800x600" "640x480"
+ EndSubSection
+SUBSECTION
+fi
printf "EndSection\n" >&4
# Close file descriptor 4 before we delete temporary files
Reply to: