summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-21 17:33:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 14:32:40 +0000
commit2a775ebbb175dd70fc7228607c306d4ccb9e4ba4 (patch)
treea5bbd9d4103dd358dafb9a063d4e1dcbdf559411
parentb851504dcf5e147c9efb1c7b6a4d22c1a1a87cd7 (diff)
downloadopenembedded-core-contrib-2a775ebbb175dd70fc7228607c306d4ccb9e4ba4.tar.gz
openembedded-core-contrib-2a775ebbb175dd70fc7228607c306d4ccb9e4ba4.tar.bz2
openembedded-core-contrib-2a775ebbb175dd70fc7228607c306d4ccb9e4ba4.zip
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>
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-25.bb1
1 files changed, 1 insertions, 0 deletions
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