[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Pagano]

commit:     d2cfdf5fd9db37677421c900f330d58a8674de13
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 18:54:29 2018 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 18:56:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cfdf5f

kernel-2.eclass:

Fix the unapplying of fbcondecor for sparc and include check
for K_WANT_GENPATCHES. Closes bug #652152.

 eclass/kernel-2.eclass | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index c60340234f5..a7501e936ca 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1257,12 +1257,14 @@ unipatch() {
        # bug #272676
        if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then
                if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} 
> 2.6.28 ]]; then
-                       UNIPATCH_DROP="${UNIPATCH_DROP} 
*_fbcondecor-0.9.6.patch"
-                       echo
-                       ewarn "fbcondecor currently prevents sparc/sparc64 from 
booting"
-                       ewarn "for kernel versions >= 2.6.29. Removing 
fbcondecor patch."
-                       ewarn "See 
https://bugs.gentoo.org/show_bug.cgi?id=272676 for details"
-                       echo
+                       if [[ ! -z ${K_WANT_GENPATCHES} ]] ; then
+                               UNIPATCH_DROP="${UNIPATCH_DROP} 
*_fbcondecor*.patch"
+                               echo
+                               ewarn "fbcondecor currently prevents 
sparc/sparc64 from booting"
+                               ewarn "for kernel versions >= 2.6.29. Removing 
fbcondecor patch."
+                               ewarn "See 
https://bugs.gentoo.org/show_bug.cgi?id=272676 for details"
+                               echo
+                       fi
                fi
        fi