From: "Tom Wijsman (tomwij)" <tomwij@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
Date: Mon, 14 Apr 2014 20:21:42 +0000 (UTC) [thread overview]
Message-ID: <20140414202142.37BDB2004B@flycatcher.gentoo.org> (raw)
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 <TomWij@gentoo.org> kernel-2.eclass:
+ Temporarily fix up >=sys-kernel/git-sources-3.15_rc1.ebuild, bug #507656.
14 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> 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}
next reply other threads:[~2014-04-14 20:21 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 20:21 Tom Wijsman (tomwij) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-19 15:46 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass Mike Pagano (mpagano)
2015-06-27 17:41 Mike Pagano (mpagano)
2015-06-27 17:27 Mike Pagano (mpagano)
2015-06-27 15:36 Mike Pagano (mpagano)
2015-06-27 0:50 Mike Pagano (mpagano)
2015-06-26 22:32 Mike Pagano (mpagano)
2015-05-30 16:09 Mike Pagano (mpagano)
2015-05-14 19:26 Mike Pagano (mpagano)
2015-04-29 0:07 Mike Pagano (mpagano)
2015-04-27 18:59 Mike Pagano (mpagano)
2015-03-20 0:13 Mike Pagano (mpagano)
2015-02-27 23:44 Mike Pagano (mpagano)
2015-02-23 12:42 Mike Pagano (mpagano)
2014-11-28 17:40 Mike Pagano (mpagano)
2014-04-21 0:08 Mike Pagano (mpagano)
2014-01-18 14:53 Mike Gilbert (floppym)
2014-01-17 19:05 Mike Pagano (mpagano)
2014-01-17 18:14 Mike Pagano (mpagano)
2013-11-18 13:19 Tom Wijsman (tomwij)
2013-11-02 12:58 Tom Wijsman (tomwij)
2013-09-05 17:04 Tom Wijsman (tomwij)
2013-07-31 21:18 Julian Ospald (hasufell)
2013-07-15 14:04 Samuli Suominen (ssuominen)
2013-04-29 22:14 Tom Wijsman (tomwij)
2013-04-17 20:59 Tom Wijsman (tomwij)
2013-04-17 13:52 Tom Wijsman (tomwij)
2013-03-20 16:45 Tom Wijsman (tomwij)
2013-03-20 7:55 Tom Wijsman (tomwij)
2013-03-09 21:05 Tom Wijsman (tomwij)
2013-03-05 19:52 Mike Pagano (mpagano)
2012-06-24 17:52 Mike Pagano (mpagano)
2012-06-06 17:00 Mike Pagano (mpagano)
2012-03-17 0:02 Mike Pagano (mpagano)
2011-12-28 13:38 Stratos Psomadakis (psomas)
2011-11-08 1:05 Mike Pagano (mpagano)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140414202142.37BDB2004B@flycatcher.gentoo.org \
--to=tomwij@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox