Error building glib

Using master as of 2015-12-16 (f1f3716776078d68bd9e3734bca881a486dc2ea3) I get this error:

ERROR: Command Error: exit status: 1 Output:
Applying patch allow-deprecated.patch
patching file Makefile.am
Hunk #1 succeeded at 18 (offset -5 lines).
patching file gio/fam/Makefile.am
Hunk #1 succeeded at 13 (offset -10 lines).
can't find file to patch at input line 31
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------

|Index: glib-2.36.0/gio/fen/Makefile.am
|===================================================================
|--- glib-2.36.0.orig/gio/fen/Makefile.am
|+++ glib-2.36.0/gio/fen/Makefile.am

--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patching file gio/inotify/Makefile.am
Hunk #1 succeeded at 24 (offset -4 lines). patching file gio/kqueue/Makefile.am
Hunk #1 succeeded at 28 (offset -4 lines). patching file gio/win32/Makefile.am
patching file gmodule/Makefile.am
patching file Makefile.in
Hunk #1 succeeded at 840 with fuzz 1 (offset 368 lines). patching file gio/fam/Makefile.in
Hunk #1 succeeded at 787 (offset 354 lines). can't find file to patch at input line 111 Perhaps you used the wrong -p or --strip option? The text leading up to this was:
--------------------------

|Index: glib-2.36.0/gio/fen/Makefile.in
|===================================================================
|--- glib-2.36.0.orig/gio/fen/Makefile.in
|+++ glib-2.36.0/gio/fen/Makefile.in

--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patching file gio/inotify/Makefile.in
Hunk #1 succeeded at 798 with fuzz 2 (offset 389 lines).
patching file gio/kqueue/Makefile.in
Hunk #1 succeeded at 802 with fuzz 2 (offset 389 lines).
patching file gio/win32/Makefile.in
Hunk #1 succeeded at 800 with fuzz 2 (offset 395 lines).
patching file gmodule/Makefile.in
Hunk #1 succeeded at 785 with fuzz 1 (offset 366 lines).
Patch allow-deprecated.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /local/p0382_2015-12-16/tmp/work/cortexa9hf-vfp-neon-amltd-linux-gnueabi/glib-2.0/1_2.46.1-r0/temp/log.do_patch.7269
ERROR: Task 2389 (/local/poky-cutting-edge/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb, do_patch) failed with exit code '1'

Any ideas?

------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Looks like you have a layer with a bbappend for glib-2.0, as master's glib-2.0 doesn't have that patch:

SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
           file://configure-libtool.patch \
           file://fix-conflicting-rand.patch \
           file://add-march-i486-into-CFLAGS-automatically.patch \
           file://glib-2.0-configure-readlink.patch \
           file://run-ptest \
           file://ptest-paths.patch \
           file://uclibc.patch \

 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
           file://allow-run-media-sdX-drive-mount-if-username-root.patch \
  file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
  file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \
           file://Enable-more-tests-while-cross-compiling.patch \
          "

In fact that revision isn't a poky or oe-core commit.

The problem is that allow-deprecated.patch is patching generated files. Remove all hunks that touch Makefile.in.

Ross

I didn't think to look for that. Oh the perils of % in recipe names.

Thanks

------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------