qemu-native-0.8.2-r2 fails to build

[VLG <3rdshift@comcast.net>]

Hi,

I am trying to build 'openzaurus-3.5.4.2' distro for 'collie' in the
org.openembedded.oz354x/ without much luck:

$ bitbake gpe-image
--------------------------------------------------------------------------------
OE Build Configuration:
BB_VERSION     = "1.6.3"
OE_REVISION    = "format_version "1"

new_manifest [0000000000000000000000000000000000000004]

old_revision [87c2d837ea5586793e98a4604630ceb3fa70dc7c]"
TARGET_ARCH    = "arm"
TARGET_OS      = "linux"
MACHINE        = "collie"
DISTRO         = "openzaurus"
DISTRO_VERSION = "3.5.4.2-rc2"
TARGET_FPU     = "soft"

NOTE: package qemu-native-0.8.2: started
NOTE: package qemu-native-0.8.2-r2: task do_fetch: started
NOTE: package qemu-native-0.8.2-r2: task do_fetch: completed
NOTE: package qemu-native-0.8.2-r2: task do_patch: started
NOTE: Applying patch '2.6.17-linux-libc-headers-fix.patch'
NOTE: Applying patch 'debug.patch'
ERROR: function do_patchcmd failed
ERROR: log data follows
(/extra/stuff/tmp/work/qemu-native-0.8.2-r2/temp/log.do_patchcmd.22315)
| Importing
patch /extra/stuff/org.openembedded.oz354x/packages/qemu/qemu-native-0.8.2/./debug.patch (stored as debug.patch)
| cp: cannot stat
`/extra/stuff/org.openembedded.oz354x/packages/qemu/qemu-native-0.8.2/./debug.patch': No such file or directory
| Failed to import patch debug.patch
NOTE: Task
failed: /extra/stuff/tmp/work/qemu-native-0.8.2-r2/temp/log.do_patchcmd.22315
NOTE: package qemu-native-0.8.2-r2: task do_patch: failed
ERROR: TaskFailed event exception, aborting
NOTE: package qemu-native-0.8.2: failed
----------------------------------------------------------------------------------

My local.conf file (if that matters)
---------------------------------------------------------------------
DL_DIR = "/extra/stuff/sources"
BBFILES = "/extra/stuff/org.openembedded.oz354x/packages/*/*.bb"
BBMASK = ""
MACHINE = "collie"
TARGET_ARCH = "arm"
DISTRO = "openzaurus-3.5.4.2"
IMAGE_FSTYPES = "jffs2 tar"
BBINCLUDELOGS = "yes"
---------------------------------------------------------------------

Strangely enough, the same builds fine against org.openembedded.dev
branch.
Any ideas?

BTW,  if I set DISTRO to openzaurus-3.5.4, the version check fails (???)
although the /extra/stuff/org.openembedded.oz354x/conf/distro has
openzaurus-3.5.4.conf

thanks,
-Vlad