diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:01:23 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-06-23 18:01:23 +0100 |
| commit | c9e77c18aa0c7962e00559d4122d840f90a62e79 (patch) | |
| tree | 480720d4c1f422544f5f8c514ecf4508a6df185e /meta | |
| parent | 8ce85086f697eb0b08076ee8939d3167cab4c549 (diff) | |
| download | openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.gz openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.bz2 openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.tar.xz openembedded-core-c9e77c18aa0c7962e00559d4122d840f90a62e79.zip | |
qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/qemu/qemu_0.12.4.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/qemu/qemu_0.12.4.bb b/meta/packages/qemu/qemu_0.12.4.bb index f1ecf3c06..79b0749f3 100644 --- a/meta/packages/qemu/qemu_0.12.4.bb +++ b/meta/packages/qemu/qemu_0.12.4.bb @@ -13,7 +13,7 @@ SRC_URI = "\ file://fix-dirent.patch \ file://fix-nogl.patch \ file://qemugl-allow-glxcontext-release.patch \ - file://linker-flags.patch" - file://init-info.patch;patch=1" + file://linker-flags.patch \ + file://init-info.patch" S = "${WORKDIR}/qemu-${PV}" |