diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-12-22 15:02:05 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-12-22 15:02:05 +0000 |
| commit | f2c4f3397c04101dc3877cd644f8747d93a32eb8 (patch) | |
| tree | 5deeee72b1dbc33d9d9e82564cdffcb3f5972339 /packages | |
| parent | 7f3a107ffad1c762c0f9667439f0b28f48b2ffc8 (diff) | |
| parent | 46fde04ffa4861599bd6a17702d1d36ffeee14b4 (diff) | |
merge of '700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0'
and 'b9d02215b2fc8567ca9440f96665d1645ec21d56'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/tasks/task-boot.bb | 2 | ||||
| -rw-r--r-- | packages/xserver-common/files/unbreak-simpad.patch | 18 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.18.bb | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 0435c2aa62..5663ff5a3d 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r42" +PR = "r43" inherit task diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch new file mode 100644 index 0000000000..7f557c317d --- /dev/null +++ b/packages/xserver-common/files/unbreak-simpad.patch @@ -0,0 +1,18 @@ +--- xserver-common-1.18/X11/Xinit.d/12keymap.org 2007-08-24 14:14:31.000000000 +0300 ++++ xserver-common-1.18/X11/Xinit.d/12keymap 2007-12-22 15:06:52.000000000 +0200 +@@ -15,14 +15,11 @@ + "Sharp-Collie") + xmodmap - < /etc/X11/collie.xmodmap + ;; +- "Simpad") +- xmodmap - < /etc/X11/simpad.xmodmap +- ;; + "HP iPAQ h6300") + xmodmap - < /etc/X11/h6300.xmodmap + ;; + # All the rest of keyboardless PDA machines use common buttonmap +- "HP iPAQ"* | "Asus MyPal"*) ++ "Simpad" | "HP iPAQ"* | "Asus MyPal"*) + xmodmap - < /etc/X11/keyboardless.xmodmap + ;; + esac diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb index a30a37c893..bf7b049939 100644 --- a/packages/xserver-common/xserver-common_1.18.bb +++ b/packages/xserver-common/xserver-common_1.18.bb @@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe -SRC_URI_append = " file://setDPI.sh " +SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh " do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" |