From 4ae3822224cd78c73c3af25a137e0672278d276f Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Mon, 12 May 2014 10:30:46 -0600 Subject: 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 Signed-off-by: Joe MacDonald --- .../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 4474e1d093..4237dc4c51 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}\\\"\"" } -- cgit 1.2.3-korg