Skip to contentSkip to conversation

net-tools: Fix rerunning of do_patch task

PATCH New Richard Purdie 1 participant 1 message Jan 21, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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]

meta/recipes-extended/net-tools/net-tools_1.60-25.bb +1 -0
index 02826a0..0e4ee75 100644
@@ -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