summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 16:06:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 16:31:59 (GMT)
commit239e8b98531c1a061b843d431d01a937c049c1e0 (patch)
tree69877cd66c020dd123346c8b51b67c3f0de45837 /meta
parentdcaea1447c1a67180a4ea56e3005f8015b2d021b (diff)
downloadpoky-239e8b98531c1a061b843d431d01a937c049c1e0.tar.gz
net-tools: Fix do_patch to be re-executable
This recipe's do_patch was not able to be re-executed due to its custom patching functions. This fixes things so that it can be re-executed. It also fixes the unpack task re-execution by ensuring ${S} is clean before the unpack starts. [YOCTO #2194] (From OE-Core rev: 1cfddb17e0c2576e55f62c10612e7cbd73e5ac5e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-23.bb12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index 213fb60..c8d2c57 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -31,11 +31,19 @@ PARALLEL_MAKE = ""
31# up all previously applied patches in the start 31# up all previously applied patches in the start
32nettools_do_patch() { 32nettools_do_patch() {
33 cd ${S} 33 cd ${S}
34 patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff 34 quilt pop -a || true
35 if [ -d ${S}/.pc-nettools ]; then
36 mv ${S}/.pc-nettools ${S}/.pc
37 QUILT_PATCHES=${S}/debian/patches quilt pop -a
38 rm -rf ${S}/.pc ${S}/debian
39 fi
40 patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff
35 QUILT_PATCHES=${S}/debian/patches quilt push -a 41 QUILT_PATCHES=${S}/debian/patches quilt push -a
36 rm -rf ${S}/patches ${S}/.pc 42 mv ${S}/.pc ${S}/.pc-nettools
37} 43}
38 44
45do_unpack[cleandirs] += "${S}"
46
39# We invoke base do_patch at end, to incorporate any local patch 47# We invoke base do_patch at end, to incorporate any local patch
40python do_patch() { 48python do_patch() {
41 bb.build.exec_func('nettools_do_patch', d) 49 bb.build.exec_func('nettools_do_patch', d)