* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-sources: metadata.xml ChangeLog freebsd-sources-9.2_rc1.ebuild
@ 2013-08-11 19:14 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-11 19:14 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/11 19:14:57
Modified: metadata.xml ChangeLog
freebsd-sources-9.2_rc1.ebuild
Log:
Add a useflag to build and install a generic kernel. It makes updates easier.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.2 sys-freebsd/freebsd-sources/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 1 Apr 2006 16:43:51 -0000 1.1
+++ metadata.xml 11 Aug 2013 19:14:57 -0000 1.2
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>bsd</herd>
+ <use>
+ <flag name='build-generic'>Build and install a generic kernel (recommended).</flag>
+ </use>
</pkgmetadata>
1.94 sys-freebsd/freebsd-sources/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?r1=1.93&r2=1.94
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 11 Aug 2013 14:34:25 -0000 1.93
+++ ChangeLog 11 Aug 2013 19:14:57 -0000 1.94
@@ -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.93 2013/08/11 14:34:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.94 2013/08/11 19:14:57 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+ freebsd-sources-9.2_rc1.ebuild, metadata.xml:
+ Add a useflag to build and install a generic kernel. It makes updates easier.
11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
freebsd-sources-9.2_rc1.ebuild:
1.4 sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?r1=1.3&r2=1.4
Index: freebsd-sources-9.2_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freebsd-sources-9.2_rc1.ebuild 11 Aug 2013 14:34:25 -0000 1.3
+++ freebsd-sources-9.2_rc1.ebuild 11 Aug 2013 19:14:57 -0000 1.4
@@ -1,13 +1,15 @@
# 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.3 2013/08/11 14:34:25 aballier Exp $
+# $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 $
-inherit bsdmk freebsd flag-o-matic
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
DESCRIPTION="FreeBSD kernel sources"
SLOT="0"
-IUSE=""
+IUSE="+build-generic profile"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -16,12 +18,17 @@
RDEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
!sys-freebsd/virtio-kmod"
-DEPEND=""
+DEPEND="build-generic? (
+ =sys-freebsd/freebsd-usbin-${RV}*
+ =sys-freebsd/freebsd-mk-defs-${RV}*
+ )"
RESTRICT="strip binchecks"
S="${WORKDIR}/sys"
+KERN_BUILD=GENERIC
+
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
@@ -34,9 +41,7 @@
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
-src_unpack() {
- freebsd_src_unpack
-
+src_prepare() {
# This replaces the gentoover patch, it doesn't need reapply every time.
sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
@@ -53,13 +58,37 @@
sed -e "s:-Werror:-Wno-error:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die
+
+ # Only used with USE=build-generic, let the kernel build with its own flags, its safer.
+ unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+ if use build-generic ; then
+ tc-export CC
+ cd "${S}/$(tc-arch-kernel)/conf" || die
+ config ${KERN_BUILD} || die
+ fi
}
src_compile() {
- einfo "Nothing to compile.."
+ if use build-generic ; then
+ cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+ freebsd_src_compile depend
+ freebsd_src_compile
+ else
+ einfo "Nothing to compile.."
+ fi
}
src_install() {
+ if use build-generic ; then
+ cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+ freebsd_src_install
+ rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+ cd "${S}"
+ fi
+
insinto "/usr/src/sys"
doins -r "${S}/"*
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-sources: metadata.xml ChangeLog freebsd-sources-9.2_rc1.ebuild
@ 2013-08-14 17:33 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-14 17:33 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/14 17:33:34
Modified: metadata.xml ChangeLog
freebsd-sources-9.2_rc1.ebuild
Log:
Make dtrace (and CDDL) support optional, bug #481024 by Yuta SATOH
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.3 sys-freebsd/freebsd-sources/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?r1=1.2&r2=1.3
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml 11 Aug 2013 19:14:57 -0000 1.2
+++ metadata.xml 14 Aug 2013 17:33:34 -0000 1.3
@@ -4,5 +4,6 @@
<herd>bsd</herd>
<use>
<flag name='build-generic'>Build and install a generic kernel (recommended).</flag>
+ <flag name='dtrace'>Enable DTrace support.</flag>
</use>
</pkgmetadata>
1.97 sys-freebsd/freebsd-sources/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?r1=1.96&r2=1.97
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog 12 Aug 2013 15:05:44 -0000 1.96
+++ ChangeLog 14 Aug 2013 17:33:34 -0000 1.97
@@ -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.96 2013/08/12 15:05:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.97 2013/08/14 17:33:34 aballier Exp $
+
+ 14 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+ freebsd-sources-9.2_rc1.ebuild, metadata.xml:
+ Make dtrace (and CDDL) support optional, bug #481024 by Yuta SATOH
12 Aug 2013; Alexis Ballier <aballier@gentoo.org>
freebsd-sources-9.2_rc1.ebuild:
1.7 sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild?r1=1.6&r2=1.7
Index: freebsd-sources-9.2_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freebsd-sources-9.2_rc1.ebuild 12 Aug 2013 15:05:44 -0000 1.6
+++ freebsd-sources-9.2_rc1.ebuild 14 Aug 2013 17:33:34 -0000 1.7
@@ -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.6 2013/08/12 15:05:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.7 2013/08/14 17:33:34 aballier Exp $
EAPI=5
@@ -9,19 +9,19 @@
DESCRIPTION="FreeBSD kernel sources"
SLOT="0"
-IUSE="+build-generic profile"
+IUSE="+build-generic dtrace profile"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
fi
-RDEPEND="=sys-freebsd/freebsd-cddl-${RV}*
+RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
=sys-freebsd/freebsd-mk-defs-${RV}*
!sys-freebsd/virtio-kmod"
DEPEND="build-generic? (
- =sys-freebsd/freebsd-cddl-${RV}*
- =sys-freebsd/freebsd-usbin-${RV}*
+ dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
+ >=sys-freebsd/freebsd-usbin-9.1
=sys-freebsd/freebsd-mk-defs-${RV}*
)"
@@ -74,9 +74,12 @@
src_compile() {
if use build-generic ; then
+ local myconf
+ use dtrace || myconf="-DNO_CTF "
+
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend
- freebsd_src_compile
+ freebsd_src_compile depend ${myconf}
+ freebsd_src_compile ${myconf}
else
einfo "Nothing to compile.."
fi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-14 17:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-11 19:14 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-sources: metadata.xml ChangeLog freebsd-sources-9.2_rc1.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 17:33 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox