[oe-commits] org.oe.dev merge of '6bcbba52935837d8cc6bbd2b56f5836157870682'
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Feb 3 01:05:54 UTC 2008
merge of '6bcbba52935837d8cc6bbd2b56f5836157870682'
and 'f83b56f2c6061d5f1487eab87b4530480d6bb88e'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5615e5b95a27aec9a41c291185be1f9b6baff7e2
ViewMTN: http://monotone.openembedded.org/revision/info/5615e5b95a27aec9a41c291185be1f9b6baff7e2
Files:
1
packages/qemu/qemu-0.9.1/writev_fix.patch
packages/qemu/qemu_0.9.1.bb
packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch
conf/machine/h5000.conf
packages/tasks/task-base.bb
packages/xorg-app/bdftopcf-native_1.0.0.bb
packages/xorg-font/font-util-native_1.0.1.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:
#
# mt diff -r6bcbba52935837d8cc6bbd2b56f5836157870682 -r5615e5b95a27aec9a41c291185be1f9b6baff7e2
#
#
#
# add_file "packages/qemu/qemu-0.9.1/writev_fix.patch"
# content [3f2bd27101b7c9040d2fb4744e2ebe2231460cff]
#
# patch "packages/qemu/qemu_0.9.1.bb"
# from [f8d662dfd4e4b410c48acb09eac959d69412e332]
# to [bf513f5e837d2341359ac2ed28d1e0c8b9d8ef93]
#
============================================================
--- packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
+++ packages/qemu/qemu-0.9.1/writev_fix.patch 3f2bd27101b7c9040d2fb4744e2ebe2231460cff
@@ -0,0 +1,17 @@
+---
+ linux-user/syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: qemu-0.9.1/linux-user/syscall.c
+===================================================================
+--- qemu-0.9.1.orig/linux-user/syscall.c 2008-02-03 00:00:00.000000000 +0000
++++ qemu-0.9.1/linux-user/syscall.c 2008-02-03 00:00:38.000000000 +0000
+@@ -1048,7 +1048,7 @@ static abi_long lock_iovec(int type, str
+ base = tswapl(target_vec[i].iov_base);
+ vec[i].iov_len = tswapl(target_vec[i].iov_len);
+ vec[i].iov_base = lock_user(type, base, vec[i].iov_len, copy);
+- if (!vec[i].iov_base)
++ if (!vec[i].iov_base && vec[i].iov_len)
+ goto fail;
+ }
+ unlock_user (target_vec, target_addr, 0);
============================================================
--- packages/qemu/qemu_0.9.1.bb f8d662dfd4e4b410c48acb09eac959d69412e332
+++ packages/qemu/qemu_0.9.1.bb bf513f5e837d2341359ac2ed28d1e0c8b9d8ef93
@@ -1,6 +1,6 @@ DEPENDS = "zlib"
LICENSE = "GPL"
DEPENDS = "zlib"
-PR = "r6"
+PR = "r7"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
@@ -31,6 +31,7 @@ SRC_URI = "\
file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
file://workaround_bad_futex_headers.patch;patch=1 \
file://fix_segfault.patch;patch=1 \
+ file://writev_fix.patch;patch=1 \
file://configure_symlinkpath_fix.patch;patch=1 \
file://disable-error-in-configure.patch;patch=1 \
file://no-strip.patch;patch=1"
#
# mt diff -rf83b56f2c6061d5f1487eab87b4530480d6bb88e -r5615e5b95a27aec9a41c291185be1f9b6baff7e2
#
#
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# patch "conf/machine/h5000.conf"
# from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
# to [e03a562f647e39de325cf64e33abb934e96da504]
#
# patch "packages/tasks/task-base.bb"
# from [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
# to [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#
# patch "packages/xorg-app/bdftopcf-native_1.0.0.bb"
# from [60d6c9131e6edb0c83a67fd03de07e9b8331719c]
# to [7f4e40b838d6811415a1d0a5752d2cc807af3d67]
#
# patch "packages/xorg-font/font-util-native_1.0.1.bb"
# from [e15331aa720a2c0392a072ac4bedee6d2406739c]
# to [38bd9ec3ecff18a104db97c5ea359a0ec7b06c93]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [b08682b1e497d6999914f7b52000ff0293b6b2ef]
# to [e924574025f2310b2e6051f3aeef14fd3082d730]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
+++ packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch 2dd41bf751f18da06f0d638ee68db2ba1a670f11
@@ -0,0 +1,16 @@
+Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c
+===================================================================
+--- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200
++++ xorg-server-1.4/hw/kdrive/linux/keyboard.c 2007-09-29 18:33:02.000000000 +0200
+@@ -743,11 +743,6 @@
+ cfsetispeed(&nTty, 9600);
+ cfsetospeed(&nTty, 9600);
+ tcsetattr(fd, TCSANOW, &nTty);
+- /*
+- * Flush any pending keystrokes
+- */
+- while ((n = read (fd, buf, sizeof (buf))) > 0)
+- ;
+ KdRegisterFd (fd, LinuxKeyboardRead, ki);
+ return Success;
+ }
============================================================
--- conf/machine/h5000.conf b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
kernel-module-h5400-battery \
- kernel-module-snd-soc-h5000"
+ kernel-module-snd-soc-h5000 \
+ kernel-module-i2c-pxa"
#
# Modules autoload and other boot properties
============================================================
--- packages/tasks/task-base.bb c13ff0dc014dd2c93926e1f1aef880d9dda3571c
+++ packages/tasks/task-base.bb 1a4f000020453dc9598a87cbb8a1df9e88bc5c96
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
inherit task
============================================================
--- packages/xorg-app/bdftopcf-native_1.0.0.bb 60d6c9131e6edb0c83a67fd03de07e9b8331719c
+++ packages/xorg-app/bdftopcf-native_1.0.0.bb 7f4e40b838d6811415a1d0a5752d2cc807af3d67
@@ -1,13 +1,8 @@
-DESCRIPTION = "Native bdftopdf utility"
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-app-common.inc
PE = "1"
-S="${WORKDIR}/bdftopcf-${PV}"
+XORG_PN = "bdftopcf"
DEPENDS = "libxfont-native"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
-
-inherit native autotools pkgconfig
-
============================================================
--- packages/xorg-font/font-util-native_1.0.1.bb e15331aa720a2c0392a072ac4bedee6d2406739c
+++ packages/xorg-font/font-util-native_1.0.1.bb 38bd9ec3ecff18a104db97c5ea359a0ec7b06c93
@@ -1,13 +1,8 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-font-common.inc
-S="${WORKDIR}/font-util-${PV}"
+XORG_PN = "font-util"
DEPENDS = "bdftopcf-native"
PE = "1"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.4.bb b08682b1e497d6999914f7b52000ff0293b6b2ef
+++ packages/xorg-xserver/xserver-kdrive_1.4.bb e924574025f2310b2e6051f3aeef14fd3082d730
@@ -1,9 +1,9 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "hal libxkbfile libxcalibrate pixman"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://xcalibrate-new-input-world-order.patch;patch=1 \
file://tslib-default-device.patch;patch=1 \
file://fbdev-evdev.patch;patch=1 \
+ file://keyboard-resume-workaround.patch;patch=1 \
file://xorg-avr32-support.diff;patch=1 \
"
More information about the Openembedded-commits
mailing list