From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77B8A138334 for ; Mon, 18 Jun 2018 18:56:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9ECF5E0833; Mon, 18 Jun 2018 18:56:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67CF1E0833 for ; Mon, 18 Jun 2018 18:56:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2DBE335C7D for ; Mon, 18 Jun 2018 18:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC92F2C2 for ; Mon, 18 Jun 2018 18:56:25 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1529348181.d2cfdf5fd9db37677421c900f330d58a8674de13.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: d2cfdf5fd9db37677421c900f330d58a8674de13 X-VCS-Branch: master Date: Mon, 18 Jun 2018 18:56:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 01c274aa-dacf-428a-bcb3-4605e8ccc46b X-Archives-Hash: c63a2d14033cbce618c048e4df701a4e commit: d2cfdf5fd9db37677421c900f330d58a8674de13 Author: Mike Pagano gentoo org> AuthorDate: Mon Jun 18 18:54:29 2018 +0000 Commit: Mike Pagano gentoo 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