/[gentoo-x86]/eclass/kernel-2.eclass
Gentoo

Diff of /eclass/kernel-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.294 Revision 1.295
1# Copyright 1999-2014 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.294 2014/01/18 14:53:07 floppym Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.295 2014/04/14 20:21:42 tomwij Exp $
4 4
5# Description: kernel.eclass rewrite for a clean base regarding the 2.6 5# Description: kernel.eclass rewrite for a clean base regarding the 2.6
6# series of kernel with back-compatibility for 2.4 6# series of kernel with back-compatibility for 2.4
7# 7#
8# Original author: John Mylchreest <johnm@gentoo.org> 8# Original author: John Mylchreest <johnm@gentoo.org>
1036 [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/} 1036 [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/}
1037 #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/} 1037 #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/}
1038 1038
1039 if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi 1039 if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi
1040 1040
1041 ####################################################################
1042 # IMPORTANT: This is temporary code to support Linux git 3.15_rc1! #
1043 # #
1044 # The patch contains a removal of a symlink, followed by addition #
1045 # of a file with the same name as the symlink in the same #
1046 # location; this causes the dry-run to fail, filed bug #507656. #
1047 # #
1048 # https://bugs.gentoo.org/show_bug.cgi?id=507656 #
1049 ####################################################################
1050 if [[ ${PN} == "git-sources" ]] ; then
1051 if [[ ${i} == *"/patch-3.15-rc1.patch" ]] ; then
1052 ebegin "Applying ${i/*\//} (-p1)"
1053 if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then
1054 eend 0
1055 rm ${STDERR_T}
1056 break
1057 else
1058 eend 1
1059 eerror "Failed to apply patch ${i/*\//}"
1060 eerror "Please attach ${STDERR_T} to any bug you may post."
1061 eshopts_pop
1062 die "Failed to apply ${i/*\//} on patch depth 1."
1063 fi
1064 fi
1065 fi
1066 ####################################################################
1067
1041 while [ ${PATCH_DEPTH} -lt 5 ]; do 1068 while [ ${PATCH_DEPTH} -lt 5 ]; do
1042 echo "Attempting Dry-run:" >> ${STDERR_T} 1069 echo "Attempting Dry-run:" >> ${STDERR_T}
1043 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} 1070 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T}
1044 echo "=======================================================" >> ${STDERR_T} 1071 echo "=======================================================" >> ${STDERR_T}
1045 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then 1072 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then

Legend:
Removed from v.1.294  
changed lines
  Added in v.1.295

  ViewVC Help
Powered by ViewVC 1.1.20