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-02-11 17:40:09 +0000
commit909a80fe34da981a0e20689812cdb2d70525f8e9 (patch)
tree17458b1c8d8624bee96039a345e32d02470b909a
parent71164f126ba853f611d8f366ccb9c63df78480a2 (diff)
downloadpoky-909a80fe34da981a0e20689812cdb2d70525f8e9.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) (From OE-Core rev: d979f8589da79e02afac588e8b63d571f912f528) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> 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() {
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