commit: 5cc7c262f8b3395184aafcfacb4541920be46b9e
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat May 17 09:29:11 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat May 17 09:29:11 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5cc7c262
freebsd-sources: changed USE flag build-generic -> build-kernel. update
-9.9999, like 10.0
---
sys-freebsd/freebsd-sources/Manifest | 5 ++--
.../freebsd-sources-10.0.9999.ebuild | 12 ++++----
.../freebsd-sources/freebsd-sources-9.9999.ebuild | 35 ++++++++++++++--------
sys-freebsd/freebsd-sources/metadata.xml | 4 ++-
4 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/sys-freebsd/freebsd-sources/Manifest
b/sys-freebsd/freebsd-sources/Manifest
index 29dbceb..a956df6 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -17,5 +17,6 @@ AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256
7457421478066b686dabc9a072ea
AUX freebsd-sources-9.2-gentoo.patch 716 SHA256
9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512
3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1
WHIRLPOOL
4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
AUX freebsd-sources-cve-2012-0217.patch 856 SHA256
9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512
b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9
WHIRLPOOL
27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
AUX freebsd-sources-cve-2012-4576.patch 561 SHA256
c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512
451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a
WHIRLPOOL
2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.0.9999.ebuild 3567 SHA256
163a63d768b54b44ccfe8c963a7b8816000e462680a96eaf458df505e964643a SHA512
a04e2b4c1bd7da4e84f5f2b341732601ddfa164399da9bfb3bab51761608d2720a492fe837fddfaf267d3732d21df56adebca9d1b7649bcbc3c8289bb7b07031
WHIRLPOOL
e270525e49df3626225a79424ca72cc9fe46b22c53867dd9634244681b93cad76d1653ed170d7b1f98dcfbd84bfcd190ece8ccab11d3fbf4f27a191dae471090
-EBUILD freebsd-sources-9.9999.ebuild 3024 SHA256
6df6d3a86062a9431c71683314bc5f2c2cbbcb14479ab0041de8979cbd366c3e SHA512
1f8a6dacf410fd2e0bff059229fbe0de5562c1ef88c9ab300a9bd848653c51349909a3a162171bfbe1bf9da9a136121c724b2f830761bcc92a95013889c4de00
WHIRLPOOL
a77cf82454af90f74e19d96555ab202bd3f75b134d502b23ae343ed75df34ec277ef028dd47e4bed77cc3b2fd715dec5db3385861b4a548786dbc5d0993d379b
+EBUILD freebsd-sources-10.0.9999.ebuild 3561 SHA256
ee16e1042b668fcf3e3dbf1898989d517dee1aba00e252318d8ef2bab7391a79 SHA512
af374b0779f43f8200258b6be243fe622bb760b837e96018d83b1fdb45d92eef736a467862dacb60467f8f4623a95f3c2ec80f66513c23b5c6949477b950ba72
WHIRLPOOL
d977c468b92b6fdb3891fe4c2391fbaaef641a9a562721552077fa5009e3f17c76c60ceb2e8280f571f6628f68bb361d0d32499250d019684769db8c48f09880
+EBUILD freebsd-sources-9.9999.ebuild 3480 SHA256
53444c2041f38e45f405f11f3ca98f833ddaec78d0ec9fd2c4d11d2826455404 SHA512
0d77fbb0c7a02d04f728f728ae89b1839fa042aa29d28189bbf82f378dd909d711f04cad5e9aab2b7ba2796dd50526475f7842664d63d09452a6359b995ef795
WHIRLPOOL
032aa9f584e58d1431d542968b927b670b40668e6350e1c3b05e38357d4da0a922ee5bdade75c1d5ca51727b3930cbe1803dec36cabcf91057e4406db2bca9a8
+MISC metadata.xml 410 SHA256
f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512
d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f
WHIRLPOOL
ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
index adce4b7..6869ed9 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.0.9999.ebuild
@@ -9,7 +9,7 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs
DESCRIPTION="FreeBSD kernel sources"
SLOT="0"
-IUSE="+build-generic debug dtrace profile zfs"
+IUSE="+build-kernel debug dtrace profile zfs"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -21,7 +21,7 @@ RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
!sys-freebsd/virtio-kmod
!sys-fs/fuse4bsd
!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-generic? (
+DEPEND="build-kernel? (
dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
!sparc-fbsd? ( sys-devel/clang )
>=sys-freebsd/freebsd-usbin-9.1
@@ -77,12 +77,12 @@ src_prepare() {
use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
- # Only used with USE=build-generic, let the kernel build with its own
flags, its safer.
+ # Only used with USE=build-kernel, let the kernel build with its own
flags, its safer.
unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
}
src_configure() {
- if use build-generic ; then
+ if use build-kernel ; then
tc-export CC
cd "${S}/$(tc-arch-kernel)/conf" || die
config ${KERN_BUILD} || die
@@ -90,7 +90,7 @@ src_configure() {
}
src_compile() {
- if use build-generic ; then
+ if use build-kernel ; then
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
freebsd_src_compile depend
freebsd_src_compile
@@ -100,7 +100,7 @@ src_compile() {
}
src_install() {
- if use build-generic ; then
+ if use build-kernel ; then
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
freebsd_src_install
rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
index dd77309..d112988 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
@@ -9,7 +9,7 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs
DESCRIPTION="FreeBSD kernel sources"
SLOT="0"
-IUSE="+build-generic dtrace profile"
+IUSE="+build-kernel debug dtrace newcons profile zfs"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -18,8 +18,9 @@ fi
RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
=sys-freebsd/freebsd-mk-defs-${RV}*
+ !<sys-freebsd/freebsd-sources-9.2_beta1
!sys-freebsd/virtio-kmod"
-DEPEND="build-generic? (
+DEPEND="build-kernel? (
dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
>=sys-freebsd/freebsd-usbin-9.1
=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -29,7 +30,7 @@ RESTRICT="strip binchecks"
S="${WORKDIR}/sys"
-KERN_BUILD=GENERIC
+KERN_BUILD=GENTOO
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo.patch"
@@ -42,7 +43,13 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+pkg_setup() {
+ use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
+}
+
src_prepare() {
+ local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
+
# This replaces the gentoover patch, it doesn't need reapply every time.
sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
@@ -51,6 +58,7 @@ src_prepare() {
# __FreeBSD_cc_version comes from FreeBSD's gcc.
# on 9.0-RELEASE it's 900001.
+ # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
-i "${S}/conf/kern.pre.mk" \
-i "${S}/conf/kmod.mk" || die "Couldn't set
__FreeBSD_cc_version"
@@ -60,12 +68,18 @@ src_prepare() {
-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.
+ # Set the kernel configuration using USE flags.
+ cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
+ use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
+ use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
+ use newcons && sed -i -e 's:include GENERIC:include VT:' "${conf}"
+
+ # Only used with USE=build-kernel, let the kernel build with its own
flags, its safer.
unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
}
src_configure() {
- if use build-generic ; then
+ if use build-kernel ; then
tc-export CC
cd "${S}/$(tc-arch-kernel)/conf" || die
config ${KERN_BUILD} || die
@@ -73,20 +87,17 @@ src_configure() {
}
src_compile() {
- if use build-generic ; then
- local myconf
- use dtrace || myconf="-DNO_CTF "
-
+ if use build-kernel ; then
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
- freebsd_src_compile depend ${myconf}
- freebsd_src_compile ${myconf}
+ freebsd_src_compile depend
+ freebsd_src_compile
else
einfo "Nothing to compile.."
fi
}
src_install() {
- if use build-generic ; then
+ if use build-kernel ; then
cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
freebsd_src_install
rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
diff --git a/sys-freebsd/freebsd-sources/metadata.xml
b/sys-freebsd/freebsd-sources/metadata.xml
index bbbd6a5..798b447 100644
--- a/sys-freebsd/freebsd-sources/metadata.xml
+++ b/sys-freebsd/freebsd-sources/metadata.xml
@@ -3,7 +3,9 @@
<pkgmetadata>
<herd>bsd</herd>
<use>
- <flag name='build-generic'>Build and install a generic kernel
(recommended).</flag>
+ <flag name='build-kernel'>Build and install a kernel (recommended).</flag>
<flag name='dtrace'>Enable DTrace support.</flag>
+ <flag name='newcons'>Enable Newcons support.</flag>
+ <flag name='zfs'>Enable ZFS support.</flag>
</use>
</pkgmetadata>
