diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/qemu | |
parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
download | openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.bz2 openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.zip |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/qemu')
-rw-r--r-- | openembedded/packages/qemu/files/nodocs_cvs.patch (renamed from openembedded/packages/qemu/files/qemu_nodocs_cvs.patch) | 0 | ||||
-rw-r--r-- | openembedded/packages/qemu/qemu-native_cvs.bb | 1 | ||||
-rw-r--r-- | openembedded/packages/qemu/qemu_cvs.bb | 4 |
3 files changed, 2 insertions, 3 deletions
diff --git a/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch b/openembedded/packages/qemu/files/nodocs_cvs.patch index b52d860fb0..b52d860fb0 100644 --- a/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch +++ b/openembedded/packages/qemu/files/nodocs_cvs.patch diff --git a/openembedded/packages/qemu/qemu-native_cvs.bb b/openembedded/packages/qemu/qemu-native_cvs.bb index 090c1408aa..976d2d664f 100644 --- a/openembedded/packages/qemu/qemu-native_cvs.bb +++ b/openembedded/packages/qemu/qemu-native_cvs.bb @@ -12,4 +12,3 @@ python __anonymous() { data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d) } - diff --git a/openembedded/packages/qemu/qemu_cvs.bb b/openembedded/packages/qemu/qemu_cvs.bb index 4a2dc13169..5ebc18c6a4 100644 --- a/openembedded/packages/qemu/qemu_cvs.bb +++ b/openembedded/packages/qemu/qemu_cvs.bb @@ -2,8 +2,8 @@ LICENSE = "GPL" PV = "0.8.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \ - file://configure.patch;patch=1 \ - file://qemu_nodocs_cvs.patch;patch=1" + file://nodocs_cvs.patch;patch=1 \ + file://configure.patch;patch=1" S = "${WORKDIR}/qemu" |