diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 17:25:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:51:18 +0000 |
| commit | d9740cdcd7d4b19eccae27665d9ce92632d6349a (patch) | |
| tree | 99b7e5cf097d7f6507cffcec9fc476fb28ba8279 | |
| parent | c96e4990feb2eb0f15fa186fe82072a1baf47387 (diff) | |
| download | poky-d9740cdcd7d4b19eccae27665d9ce92632d6349a.tar.gz | |
qemu: Ensure an internal qemugl script uses bash as it has bashisms
(From OE-Core rev: 6e26eaf03f2f524b78c194377ea0589e6913445d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch index bbc9c9eaf9..4fb972a60b 100644 --- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch | |||
| @@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh | |||
| 280 | --- /dev/null | 280 | --- /dev/null |
| 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh | 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh |
| 282 | @@ -0,0 +1,23 @@ | 282 | @@ -0,0 +1,23 @@ |
| 283 | +#! /bin/sh | 283 | +#! /bin/bash |
| 284 | +# Copyright 2008 (C) Intel Corporation | 284 | +# Copyright 2008 (C) Intel Corporation |
| 285 | +# | 285 | +# |
| 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. | 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. |
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch index bbc9c9eaf9..4fb972a60b 100644 --- a/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch | |||
| @@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh | |||
| 280 | --- /dev/null | 280 | --- /dev/null |
| 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh | 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh |
| 282 | @@ -0,0 +1,23 @@ | 282 | @@ -0,0 +1,23 @@ |
| 283 | +#! /bin/sh | 283 | +#! /bin/bash |
| 284 | +# Copyright 2008 (C) Intel Corporation | 284 | +# Copyright 2008 (C) Intel Corporation |
| 285 | +# | 285 | +# |
| 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. | 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. |
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch index bbc9c9eaf9..4fb972a60b 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch | |||
| @@ -280,7 +280,7 @@ Index: qemu-0.14.0/target-i386/beginend_funcs.sh | |||
| 280 | --- /dev/null | 280 | --- /dev/null |
| 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh | 281 | +++ qemu-0.14.0/target-i386/beginend_funcs.sh |
| 282 | @@ -0,0 +1,23 @@ | 282 | @@ -0,0 +1,23 @@ |
| 283 | +#! /bin/sh | 283 | +#! /bin/bash |
| 284 | +# Copyright 2008 (C) Intel Corporation | 284 | +# Copyright 2008 (C) Intel Corporation |
| 285 | +# | 285 | +# |
| 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. | 286 | +# echo names of functions that are legal between a glBegin and glEnd pair. |
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb index 03519ad7d4..5a0cd55bb9 100644 --- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb +++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb | |||
| @@ -3,7 +3,7 @@ require qemu.inc | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
| 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
| 5 | 5 | ||
| 6 | PR = "r3" | 6 | PR = "r4" |
| 7 | 7 | ||
| 8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
| 9 | FILESDIR = "${WORKDIR}" | 9 | FILESDIR = "${WORKDIR}" |
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.0.bb b/meta/recipes-devtools/qemu/qemu_0.15.0.bb index baeb4e9cb5..e2e13406b4 100644 --- a/meta/recipes-devtools/qemu/qemu_0.15.0.bb +++ b/meta/recipes-devtools/qemu/qemu_0.15.0.bb | |||
| @@ -3,7 +3,7 @@ require qemu.inc | |||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
| 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 4 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
| 5 | 5 | ||
| 6 | PR = "r0" | 6 | PR = "r1" |
| 7 | 7 | ||
| 8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" | 8 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" |
| 9 | FILESDIR = "${WORKDIR}" | 9 | FILESDIR = "${WORKDIR}" |
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb index 59fc7f1396..3b4369b782 100644 --- a/meta/recipes-devtools/qemu/qemu_git.bb +++ b/meta/recipes-devtools/qemu/qemu_git.bb | |||
| @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | |||
| 6 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 6 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" |
| 7 | 7 | ||
| 8 | PV = "0.14.0" | 8 | PV = "0.14.0" |
| 9 | PR = "r1" | 9 | PR = "r2" |
| 10 | 10 | ||
| 11 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" | 11 | FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" |
| 12 | FILESDIR = "${WORKDIR}" | 12 | FILESDIR = "${WORKDIR}" |
