[oe-commits] Dan McGregor : netcat-openbsd: fixup patching

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 4ae3822224cd78c73c3af25a137e0672278d276f
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4ae3822224cd78c73c3af25a137e0672278d276f

Author: Dan McGregor <dan.mcgregor at usask.ca>
Date:   Mon May 12 10:30:46 2014 -0600

netcat-openbsd: fixup patching

Do the patching in the do_patch phase instead of the compile
phase. That way if the compile phase needs to be rerun
patching isn't attempted a second time.

Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 .../recipes-support/netcat/netcat-openbsd_1.105.bb            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
index 4474e1d..4237dc4 100644
--- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
+++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
@@ -17,9 +17,18 @@ S = "${WORKDIR}/${BPN}-${PV}"
 
 do_configure[noexec] = "1"
 
-do_compile() {
+netcat_do_patch() {
     cd ${S}
     while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series
+}
+
+python do_patch() {
+    bb.build.exec_func('netcat_do_patch', d)
+    bb.build.exec_func('patch_do_patch', d)
+}
+
+do_compile() {
+    cd ${S}
     pkgrel=4
     oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\""
 }