diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 11:23:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-29 11:23:07 +0100 |
| commit | 9441aa282bc3213ef0530cab86f318b877bac25c (patch) | |
| tree | 8c82245fe6295b71dab3599dfe110e0f8be1254b /scripts | |
| parent | ba7c388963e099c0d2cedb7f048e30747ffff25d (diff) | |
| parent | 55a1d80a41032d6133adec041c0096820beaa1b7 (diff) | |
| download | qemu-9441aa282bc3213ef0530cab86f318b877bac25c.zip qemu-9441aa282bc3213ef0530cab86f318b877bac25c.tar.gz qemu-9441aa282bc3213ef0530cab86f318b877bac25c.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150529-1' into staging
kbd: add support for brazilian keyboard (two extra keys).
input: add virtio-input devices.
# gpg: Signature made Fri May 29 10:09:02 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-input-20150529-1:
virtio-input: emulated devices [device]
virtio-input: core code & base class [device]
virtio-input: add linux/input.h
kbd: add brazil kbd keys to x11 evdev map
kbd: add brazil kbd keys to qemu
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update-linux-headers.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index f208ec9..baf4220 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -31,7 +31,7 @@ fi cp_virtio() { from=$1 to=$2 - virtio=$(find "$from" -name '*virtio*h') + virtio=$(find "$from" -name '*virtio*h' -o -name "input.h") if [ "$virtio" ]; then rm -rf "$to" mkdir -p "$to" @@ -40,6 +40,7 @@ cp_virtio() { grep '#include' "$f" | grep -v -e 'linux/virtio' \ -e 'linux/types' \ -e 'linux/if_ether' \ + -e 'sys/' \ > /dev/null then echo "Unexpected #include in input file $f". @@ -48,6 +49,7 @@ cp_virtio() { header=$(basename "$f"); sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \ + -e 's/__s\([0-9][0-9]*\)/int\1_t/g' \ -e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \ -e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \ -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \ |