From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- eclass/kernel-2.eclass | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'eclass/kernel-2.eclass') diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 94937b6630ba..a7501e936cad 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -643,7 +643,7 @@ if [[ ${ETYPE} == sources ]]; then K_DEBLOB_TAG=${K_DEBLOB_TAG:--gnu} DEBLOB_A="deblob-${DEBLOB_PV}" DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}" - DEBLOB_HOMEPAGE="http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags" + DEBLOB_HOMEPAGE="https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/" DEBLOB_URI_PATH="${DEBLOB_PV}${K_DEBLOB_TAG}" if ! has "${EAPI:-0}" 0 1 ; then DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}" @@ -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 -- cgit v1.2.3