summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-08-02 14:42:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-07 12:13:03 +0100
commit422c756e0b8a2151c43841dccc50c81afa12811b (patch)
tree064771d4de632047fb643691cfc0e3cf1961f1b2
parent471c3387d4753ff4a775e0a30ee9c8c0105ab093 (diff)
downloadpoky-422c756e0b8a2151c43841dccc50c81afa12811b.tar.gz
net-tools: Ensure quilt only operates on local patches
When net-tools is built and the local patches haven't been applied, then `quilt pop -a` will climb parent directories attempting to find a {patches/.pc} directory; if this succeeds then we end up popping off some completely unrelated patches from a parent directory. Ensure that we do have a local patches directory and then turn off the directory climbing so that we avoid this problem. (From OE-Core rev: 61522645a1ccc8342706960efe90896001e94a8b) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 5657fd8c5b..a4e3285cdb 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -48,7 +48,16 @@ PARALLEL_MAKE = ""
48# up all previously applied patches in the start 48# up all previously applied patches in the start
49nettools_do_patch() { 49nettools_do_patch() {
50 cd ${S} 50 cd ${S}
51 quilt pop -a || true 51 # it's important that we only pop the existing patches when they've
52 # been applied, otherwise quilt will climb the directory tree
53 # and reverse out some completely different set of patches
54 if [ -d ${S}/patches ]; then
55 # whilst this is the default directory, doing it like this
56 # defeats the directory climbing that quilt will otherwise
57 # do; note the directory must exist to defeat this, hence
58 # the test inside which we operate
59 QUILT_PATCHES=${S}/patches quilt pop -a
60 fi
52 if [ -d ${S}/.pc-nettools ]; then 61 if [ -d ${S}/.pc-nettools ]; then
53 rm -rf ${S}/.pc 62 rm -rf ${S}/.pc
54 mv ${S}/.pc-nettools ${S}/.pc 63 mv ${S}/.pc-nettools ${S}/.pc