diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-06-18 14:54:29 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-06-18 14:56:21 -0400 |
| commit | d2cfdf5fd9db37677421c900f330d58a8674de13 (patch) | |
| tree | 734ebc48760f74a4010118294acb514fecc25c0a /eclass/kernel-2.eclass | |
| parent | profiles: arch/arm: use.mask acpi (diff) | |
| download | gentoo-d2cfdf5fd9db37677421c900f330d58a8674de13.tar.gz gentoo-d2cfdf5fd9db37677421c900f330d58a8674de13.tar.bz2 gentoo-d2cfdf5fd9db37677421c900f330d58a8674de13.zip | |
kernel-2.eclass:
Fix the unapplying of fbcondecor for sparc and include check
for K_WANT_GENPATCHES. Closes bug #652152.
Diffstat (limited to 'eclass/kernel-2.eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c60340234f55..a7501e936cad 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 |