From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 21 Jan 2015 17:33:55 +0000 (+0000)
Subject: net-tools: Fix rerunning of do_patch task
X-Git-Tag: 2015-4~652
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2a775ebbb175dd70fc7228607c306d4ccb9e4ba4;p=openembedded-core.git

net-tools: Fix rerunning of do_patch task

Rerunning the do_patch task currently fails. The code is nearly correct
but needs to remove the quilt ".pc" directory and move the secondary
one into place in order to rerun, not move it into the .pc directory
as the code currently does.

[YOCTO #7128]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb
index 02826a09c9..0e4ee754a4 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb
@@ -34,6 +34,7 @@ nettools_do_patch() {
 	cd ${S}
 	quilt pop -a || true
 	if [ -d ${S}/.pc-nettools ]; then
+		rm -rf ${S}/.pc
 		mv ${S}/.pc-nettools ${S}/.pc
 		QUILT_PATCHES=${S}/debian/patches quilt pop -a
 		rm -rf ${S}/.pc ${S}/debian