summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-08-11 21:23:03 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-08-11 21:23:03 +0000
commit11b4661fa0e58f4303cd005cfbdb16104bd094d6 (patch)
tree7252466a94602d756a0905901ab011f05ef93a6c /sys-freebsd
parentVersion bump. Drop old revision. (diff)
downloadgentoo-2-11b4661fa0e58f4303cd005cfbdb16104bd094d6.tar.gz
gentoo-2-11b4661fa0e58f4303cd005cfbdb16104bd094d6.tar.bz2
gentoo-2-11b4661fa0e58f4303cd005cfbdb16104bd094d6.zip
drop the no ctf patch now that its not needed anymore.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-sources/ChangeLog6
-rw-r--r--sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch28
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild3
3 files changed, 6 insertions, 31 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index fc9da22047fd..98c83fef75ec 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-sources
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.94 2013/08/11 19:14:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.95 2013/08/11 21:23:03 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+ freebsd-sources-9.2_rc1.ebuild, -files/freebsd-sources-9.2-no_ctf.patch:
+ drop the no ctf patch now that its not needed anymore.
11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
freebsd-sources-9.2_rc1.ebuild, metadata.xml:
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
deleted file mode 100644
index a3fe93f88177..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
-index 20d0c3f..3f5bf52 100644
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -22,7 +22,8 @@ cpu HAMMER
- ident GENERIC
-
- makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
--makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
-diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
-index f77b0fc..1f67a3a 100644
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -24,7 +24,8 @@ cpu I686_CPU
- ident GENERIC
-
- makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
--makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-+nomakeoptions WITH_CTF # Disabled on Gentoo/FreeBSD
-
- options SCHED_ULE # ULE scheduler
- options PREEMPTION # Enable kernel thread preemption
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
index d306eb28d161..c2708d0187e1 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.4 2013/08/11 19:14:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.5 2013/08/11 21:23:03 aballier Exp $
EAPI=5
@@ -37,7 +37,6 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
"${FILESDIR}/${PN}-7.1-includes.patch"
"${FILESDIR}/${PN}-9.0-sysctluint.patch"
- "${FILESDIR}/${PN}-9.2-no_ctf.patch"
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )