tomwij 14/04/14 20:21:42 Modified: ChangeLog kernel-2.eclass Log: Temporarily fix up >=sys-kernel/git-sources-3.15_rc1.ebuild, bug #507656.
Revision Changes Path 1.1206 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1206&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1206&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1205&r2=1.1206 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1205 retrieving revision 1.1206 diff -u -r1.1205 -r1.1206 --- ChangeLog 14 Apr 2014 15:45:16 -0000 1.1205 +++ ChangeLog 14 Apr 2014 20:21:42 -0000 1.1206 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1205 2014/04/14 15:45:16 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1206 2014/04/14 20:21:42 tomwij Exp $ + + 14 Apr 2014; Tom Wijsman <[email protected]> kernel-2.eclass: + Temporarily fix up >=sys-kernel/git-sources-3.15_rc1.ebuild, bug #507656. 14 Apr 2014; Maxim Koltsov <[email protected]> leechcraft.eclass: Require at least gcc-4.8 for new LeechCraft packages 1.295 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.295&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.295&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.294&r2=1.295 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- kernel-2.eclass 18 Jan 2014 14:53:07 -0000 1.294 +++ kernel-2.eclass 14 Apr 2014 20:21:42 -0000 1.295 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.294 2014/01/18 14:53:07 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.295 2014/04/14 20:21:42 tomwij Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -1038,6 +1038,33 @@ if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi + #################################################################### + # IMPORTANT: This is temporary code to support Linux git 3.15_rc1! # + # # + # The patch contains a removal of a symlink, followed by addition # + # of a file with the same name as the symlink in the same # + # location; this causes the dry-run to fail, filed bug #507656. # + # # + # https://bugs.gentoo.org/show_bug.cgi?id=507656 # + #################################################################### + if [[ ${PN} == "git-sources" ]] ; then + if [[ ${i} == *"/patch-3.15-rc1.patch" ]] ; then + ebegin "Applying ${i/*\//} (-p1)" + if [ $(patch -p1 --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then + eend 0 + rm ${STDERR_T} + break + else + eend 1 + eerror "Failed to apply patch ${i/*\//}" + eerror "Please attach ${STDERR_T} to any bug you may post." + eshopts_pop + die "Failed to apply ${i/*\//} on patch depth 1." + fi + fi + fi + #################################################################### + while [ ${PATCH_DEPTH} -lt 5 ]; do echo "Attempting Dry-run:" >> ${STDERR_T} echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T}
