mgorny 15/03/08 14:01:56 Modified: metadata.xml ChangeLog Added: freebsd-sources-10.1.ebuild Log: Add FreeBSD 10.1 ebuilds, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.4 sys-freebsd/freebsd-sources/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 14 Aug 2013 17:33:34 -0000 1.3 +++ metadata.xml 8 Mar 2015 14:01:56 -0000 1.4 @@ -4,6 +4,8 @@ <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='zfs'>Enable ZFS support.</flag> </use> </pkgmetadata> 1.107 sys-freebsd/freebsd-sources/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.107&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?rev=1.107&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog?r1=1.106&r2=1.107 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- ChangeLog 5 Jun 2014 02:33:45 -0000 1.106 +++ ChangeLog 8 Mar 2015 14:01:56 -0000 1.107 @@ -1,6 +1,17 @@ # ChangeLog for sys-freebsd/freebsd-sources -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.106 2014/06/05 02:33:45 naota Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.107 2015/03/08 14:01:56 mgorny Exp $ + +*freebsd-sources-10.1 (08 Mar 2015) + + 08 Mar 2015; Michał Górny <[email protected]> +files/config-GENTOO, + +files/freebsd-sources-10.0-gentoo.patch, + +files/freebsd-sources-10.1-cve-2014-8612.patch, + +files/freebsd-sources-10.1-cve-2014-8613.patch, + +files/freebsd-sources-10.1-cve-2015-1414.patch, +freebsd-sources-10.1.ebuild, + metadata.xml: + Add FreeBSD 10.1 ebuilds, https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/46 by nigoro. *freebsd-sources-9.1-r9 (05 Jun 2014) 1.1 sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild?rev=1.1&content-type=text/plain Index: freebsd-sources-10.1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $ EAPI=5 inherit bsdmk freebsd flag-o-matic toolchain-funcs DESCRIPTION="FreeBSD kernel sources" SLOT="0" IUSE="+build-kernel debug dtrace profile zfs" if [[ ${PV} != *9999* ]]; then KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz"; fi RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-${RV}* !sys-freebsd/virtio-kmod !sys-fs/fuse4bsd !<sys-freebsd/freebsd-sources-9.2_beta1" DEPEND="build-kernel? ( dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) !sparc-fbsd? ( sys-devel/clang ) >=sys-freebsd/freebsd-usbin-9.1 =sys-freebsd/freebsd-mk-defs-${RV}* )" RESTRICT="strip binchecks" S="${WORKDIR}/sys" KERN_BUILD=GENTOO PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" "${FILESDIR}/${PN}-10.0-gentoo.patch" "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" "${FILESDIR}/${PN}-7.1-types.h-fix.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-gentoo-gcc.patch" "${FILESDIR}/${PN}-10.1-cve-2014-8612.patch" "${FILESDIR}/${PN}-10.1-cve-2014-8613.patch" "${FILESDIR}/${PN}-10.1-cve-2015-1414.patch" ) pkg_setup() { # Force set CC=clang. when using gcc, aesni fails to build. use sparc-fbsd || export CC=clang 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":' \ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ "${S}/conf/newvers.sh" # __FreeBSD_cc_version comes from FreeBSD's gcc. # on 10.0-RELEASE it's 1000001. # 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=1000001:g" \ -i "${S}/conf/kern.pre.mk" \ -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" # Remove -Werror sed -e "s:-Werror:-Wno-error:g" \ -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-kernel, let the kernel build with its own flags, its safer. unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL } src_configure() { if use build-kernel ; then tc-export CC cd "${S}/$(tc-arch-kernel)/conf" || die config ${KERN_BUILD} || die fi } src_compile() { if use build-kernel ; then if has_version "<sys-freebsd/freebsd-ubin-10.0"; then cd "${WORKDIR}"/usr.bin/bmake || die if [[ -e /usr/lib/libgcc.a ]] ; then freebsd_src_compile else local CC_SAVE="${CC}" CC=gcc freebsd_src_compile export CC="${CC_SAVE}" fi export BMAKE="${WORKDIR}/usr.bin/bmake/make" fi 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-kernel ; 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}/"* } pkg_preinst() { if [[ -L "${ROOT}/usr/src/sys" ]]; then einfo "/usr/src/sys is a symlink, removing it..." rm -f "${ROOT}/usr/src/sys" fi if use sparc-fbsd ; then ewarn "WARNING: kldload currently causes kernel panics" ewarn "on sparc64. This is probably a gcc-4.1 issue, but" ewarn "we need gcc-4.1 to compile the kernel correctly :/" ewarn "Please compile all modules you need into the kernel" fi }
