diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2014-05-12 10:30:46 -0600 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2014-06-03 21:18:51 -0400 |
commit | 4ae3822224cd78c73c3af25a137e0672278d276f (patch) | |
tree | f144cb225e2630fa9968e45347033b79d39a8f40 | |
parent | 7734132dd3749e634865f0e093f6f91064d13633 (diff) | |
download | meta-openembedded-4ae3822224cd78c73c3af25a137e0672278d276f.tar.gz |
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@usask.ca>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 11 |
1 files changed, 10 insertions, 1 deletions
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 4474e1d09..4237dc4c5 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}" | |||
17 | 17 | ||
18 | do_configure[noexec] = "1" | 18 | do_configure[noexec] = "1" |
19 | 19 | ||
20 | do_compile() { | 20 | netcat_do_patch() { |
21 | cd ${S} | 21 | cd ${S} |
22 | while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series | 22 | while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series |
23 | } | ||
24 | |||
25 | python do_patch() { | ||
26 | bb.build.exec_func('netcat_do_patch', d) | ||
27 | bb.build.exec_func('patch_do_patch', d) | ||
28 | } | ||
29 | |||
30 | do_compile() { | ||
31 | cd ${S} | ||
23 | pkgrel=4 | 32 | pkgrel=4 |
24 | oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" | 33 | oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" |
25 | } | 34 | } |