[oe-commits] [openembedded-core] 10/12: net-tools: Ensure quilt only operates on local patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 90d526a399458f3d4c4fd890b6229d2eae587ce3
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Thu Aug 2 14:42:29 2018 +0000

    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.
    
    Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 5657fd8..a4e3285 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 = ""
 # up all previously applied patches in the start
 nettools_do_patch() {
 	cd ${S}
-	quilt pop -a || true
+	# it's important that we only pop the existing patches when they've
+	# been applied, otherwise quilt will climb the directory tree
+	# and reverse out some completely different set of patches
+	if [ -d ${S}/patches ]; then
+		# whilst this is the default directory, doing it like this
+		# defeats the directory climbing that quilt will otherwise
+		# do; note the directory must exist to defeat this, hence
+		# the test inside which we operate
+		QUILT_PATCHES=${S}/patches quilt pop -a
+	fi
 	if [ -d ${S}/.pc-nettools ]; then
 		rm -rf ${S}/.pc
 		mv ${S}/.pc-nettools ${S}/.pc

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.