diff options
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-sources/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/Manifest | 12 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild | 45 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-sources/metadata.xml | 3 |
4 files changed, 51 insertions, 15 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog index 3e6914f1f8d8..fc9da22047fd 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.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: diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 868fc9d8f415..df3d6e70fda3 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -27,13 +27,13 @@ DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cfe542049014e9bdc4de0990aba539b7518 SHA512 ab7e6301180560934da38a3ef1de3623f0e42c6ee5ba2695754784c5af80ab8367b5d5412bbee51e8ba963b7f5835be9c3789b66b33be338bb9194a9de15b2eb WHIRLPOOL 7afbf758f0a02ea0337b58dd8f12876b8b58dbf73d8a3c237e1bfe2c77b72f319080d91a52ef2918e2c133af5924b302712fcc76ebe2cb334c561f18511698b1 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15 EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00 -EBUILD freebsd-sources-9.2_rc1.ebuild 2262 SHA256 ae2c2b42d54cef7509bdda8cb875c44c2efca2fe91a9fcb3b8ab74e2369359e1 SHA512 fcfa1a069c8ff2e2c56fe807edd4636398bfed775ed84fd25be790b45b4b016b96dbed189c4a8c2aa9b6917d09095b87a2633df2d1ab9409536a0cd9d671b0e6 WHIRLPOOL 225f440bc23a761612eb85cfc6ea5d19217d6c72ed1b870f8a4fd094057f4138317ee515cdea9268b0b71d609848a25215cf36631fc1af709d95dce7aa4e1482 -MISC ChangeLog 24015 SHA256 3e132ec741c25b7adab1d22b347f51b1dad82e7b6bedac27f46ca7b3f7ef992c SHA512 225355d9eaf94130424073d7fe7c05bff2da554668f21101dbd820c37621e16f95415c4ea2698a74e57c34aeb4f8d678b0ebe3bc4c7f334d23bb4c2f00271991 WHIRLPOOL ed7b572300062a79bb2fabb302a4c7c127c549f4d68d094963c73d103a476015e2cba73f7896f2d080ebbb963e2ce63fb3569683b859d6b7857431458b4f9536 -MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84 +EBUILD freebsd-sources-9.2_rc1.ebuild 3011 SHA256 7b9cb1d7607b82002d740b87d5629d20a33ae1feba1d91ad4db47752ff7e4705 SHA512 c2308b4191c42d03b3e2621d66160cd3f900006a94279048d00ebc18f32ec81cafe87714a22d5245f0bd4f639c1d2fffc31a12ed0452afd2fdeeacc25e1f7f79 WHIRLPOOL e02c005ac11528c174bbe3afc735d59ab23096364c6a70086587b1ddb2c2c3b63669cdef18f7a3d74710f5aae29296861a663ab1a98f354b7aac7185b0cd9c03 +MISC ChangeLog 24196 SHA256 aea5e0285496e9dfa6011b80aec57aaf56c63bb322a7b87285e2a050444082b7 SHA512 266a2a53779ae67d09b75d92a74e709ec84960719999725dd6a12d9f2474eaa9a59b5b7d1404627cf696bee364b93ffc92a80ad1bb5c4d0028744ef7c6c2cc44 WHIRLPOOL 17dd449987a3b4788001090dced3aeac46ef8137f3c3c1ee1f193a0a6d2268b5a35099ddcc22b0fb060fc63ace834ae725d13850dd8da24ba0faf09f05f2b372 +MISC metadata.xml 261 SHA256 f2a21c21a5bdd227265679eafeaf6758923723ee562e79618f548cdc77472c88 SHA512 845e7613a39fad782c5cd33dd0ddc7b42132f3a0027ae9538f75cc729d613bdf032f623aadf5ec0ab8d08bff7b58c0d7edbf05819cbbccddb2dbf054a16f9c1f WHIRLPOOL 6a798d4dcabfa29cc603a191cdc30c07c8fc850116558b5e71b59393138ff1491d46a1496af356d4fb5077746ca48cb9c76dc0b9c37d0b57b8768c85d37a1a10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlIHoPMACgkQvFcC4BYPU0rpRACeMCGy1nIPpRweOU+bb5wAWc9b -/NgAn2yOWfLF9D5gz8nt0unnxXgxPLlZ -=wA35 +iEYEAREIAAYFAlIH4rMACgkQvFcC4BYPU0qSAwCfe8fPTrLwVfF1M70ruaWdsBEy +KCMAn33zg7aQ5R1i8DnEOHaHmpNRvmkv +=sbyI -----END PGP SIGNATURE----- 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 4ba5d294a7dd..d306eb28d161 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild @@ -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 @@ fi 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 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${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 @@ src_unpack() { 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}/"* } diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml index ecedda4aa2cc..4915b9b948f7 100644 --- a/sys-freebsd/freebsd-sources/metadata.xml +++ b/sys-freebsd/freebsd-sources/metadata.xml @@ -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> |