From 239e8b98531c1a061b843d431d01a937c049c1e0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 15 Apr 2012 17:06:47 +0100 Subject: 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 --- meta/recipes-extended/net-tools/net-tools_1.60-23.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta/recipes-extended') 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 213fb6075c..c8d2c57923 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 = "" # up all previously applied patches in the start nettools_do_patch() { cd ${S} - patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff + quilt pop -a || true + if [ -d ${S}/.pc-nettools ]; then + mv ${S}/.pc-nettools ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff QUILT_PATCHES=${S}/debian/patches quilt push -a - rm -rf ${S}/patches ${S}/.pc + mv ${S}/.pc ${S}/.pc-nettools } +do_unpack[cleandirs] += "${S}" + # We invoke base do_patch at end, to incorporate any local patch python do_patch() { bb.build.exec_func('nettools_do_patch', d) -- cgit v1.2.3-54-g00ecf