summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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:42 +0000
commit2b899a472a850c52f3f5228868d58cf2e6fac621 (patch)
tree2610b32e8b062e1099974453f8345b120495cd10 /meta/recipes-extended
parent11ef55a93bd2bbd95e203fab3aa237322923ffd9 (diff)
downloadpoky-2b899a472a850c52f3f5228868d58cf2e6fac621.tar.gz
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@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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() {
34 cd ${S} 34 cd ${S}
35 quilt pop -a || true 35 quilt pop -a || true
36 if [ -d ${S}/.pc-nettools ]; then 36 if [ -d ${S}/.pc-nettools ]; then
37 rm -rf ${S}/.pc
37 mv ${S}/.pc-nettools ${S}/.pc 38 mv ${S}/.pc-nettools ${S}/.pc
38 QUILT_PATCHES=${S}/debian/patches quilt pop -a 39 QUILT_PATCHES=${S}/debian/patches quilt pop -a
39 rm -rf ${S}/.pc ${S}/debian 40 rm -rf ${S}/.pc ${S}/debian