[oe-commits] Richard Purdie : net-tools: Fix rerunning of do_patch task

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dizzy
Commit: d979f8589da79e02afac588e8b63d571f912f528
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d979f8589da79e02afac588e8b63d571f912f528

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Jan 21 17:33:55 2015 +0000

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]

(From OE-Core rev: 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4)

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>

---

 meta/recipes-extended/net-tools/net-tools_1.60-25.bb | 1 +
 1 file changed, 1 insertion(+)

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 02826a0..0e4ee75 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