[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-sources/files/, sys-freebsd/freebsd-sources/

["Yuta SATOH" <nigoro.gentoo@0x100.com>]

commit:     0713c06c6b86ed286b840953e912c27f901d2a93
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Oct 15 11:25:48 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Oct 15 11:25:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0713c06c

freebsd-sources-10.9999_p256420: fix bug #487982

---
 sys-freebsd/freebsd-sources/Manifest               |  3 ++-
 sys-freebsd/freebsd-sources/files/config-GENTOO    |  4 ++++
 .../freebsd-sources-10.9999_p256420.ebuild         | 22 +++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 6ae4c20..cc5bb53 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,3 +1,4 @@
+AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
 AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
@@ -15,5 +16,5 @@ 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.9999_p256420.ebuild 3010 SHA256 1d3bdcf72d8dd0be6f8734ebbe4aff7c224c19665a3d126b9973a7add610e423 SHA512 ec1b752ef08e06c9b28b5bb27cff85d103651f000c79da989546f43bef3b3a6504163928ecba4df135f0ed2126737680e3d5fed8b4cb2713574a3a83934f111e WHIRLPOOL 080ada2115091e9cb6f3980e75fb27ac8a1039c40a695a4ffd7a54cdef90b633d423510a398fab54c1b143fbbb58291bee8458ddb720d7c21effbc974ca6ac36
+EBUILD freebsd-sources-10.9999_p256420.ebuild 3290 SHA256 62cb0058559441d3d87dd0752e73301957bd381625c4722bbb77ad16d90dab8f SHA512 5f218360ff13490722d4221256fb5301f117f31b1f28a3cc4098bc30f962c22b42c7666c133ff90dff28c463e57541473a7b64c9e1a8b69f0d87ae649cd397d8 WHIRLPOOL d1f0678835dbce17600efb8d7a09ef2fa2e9070503af982c4aa3c5f0025a8999306af0c229285e304c39a7f124a3a3a3fe34ca417cb93249789cbda1c6cefffc
 EBUILD freebsd-sources-9.9999.ebuild 3024 SHA256 c378a97b38a0aa17bd5999db9597622026967b5656f0c994df9d2701fe8c766f SHA512 72a1bac8e7d6171982ff3837fe336e51ae4bb355bb25fc9a72cf46b81b11b69d84d2d84099fb8e5bcb6ad13abe4eaba38e94b5cc57eddb85c873b291cea3a06f WHIRLPOOL 3d41a2874fa61fe78dbd3b9f8612ec3d1f51a53c756c3037450b5be0d2900e160ad8f251720ac1f99e477bde0cb1f1b1fcbd968ef71da172501a53a59142de05

diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO
new file mode 100644
index 0000000..7c7eb26
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/config-GENTOO
@@ -0,0 +1,4 @@
+# Kernel configuration for Gentoo/FreeBSD.
+include GENERIC
+ident GENTOO
+

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild
index b37f9ee..143ae40 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.9999_p256420.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-generic debug dtrace profile zfs"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
@@ -30,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}-10.0-gentoo.patch"
@@ -42,7 +42,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":' \
@@ -60,6 +66,11 @@ src_prepare() {
 		-i "${S}/conf/kern.pre.mk" \
 		-i "${S}/conf/kmod.mk" || die
 
+	# 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}"
+	
 	# Only used with USE=build-generic, let the kernel build with its own flags, its safer.
 	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
 }
@@ -74,12 +85,9 @@ src_configure() {
 
 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 ${myconf}
-		freebsd_src_compile ${myconf}
+		freebsd_src_compile depend
+		freebsd_src_compile
 	else
 		einfo "Nothing to compile.."
 	fi