floppym 14/09/09 19:55:09 Modified: grub-2.02_beta2.ebuild ChangeLog Log: Backport build fix for when both device-mapper and libzfs are enabled. Bug 496608. (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.10 sys-boot/grub/grub-2.02_beta2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild?r1=1.9&r2=1.10 Index: grub-2.02_beta2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- grub-2.02_beta2.ebuild 7 Sep 2014 19:07:16 -0000 1.9 +++ grub-2.02_beta2.ebuild 9 Sep 2014 19:55:09 -0000 1.10 @@ -1,13 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.9 2014/09/07 19:07:16 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.10 2014/09/09 19:55:09 floppym Exp $ EAPI=5 -if [[ ${PV} == 9999 ]]; then - AUTOTOOLS_AUTORECONF=1 - GRUB_AUTOGEN=1 -fi +AUTOTOOLS_AUTORECONF=1 +GRUB_AUTOGEN=1 if [[ -n ${GRUB_AUTOGEN} ]]; then PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) @@ -29,7 +27,7 @@ S=${WORKDIR}/${P%_*} fi KEYWORDS="amd64 ~x86" - PATCHES=() + PATCHES=( "${FILESDIR}/${P}-libzfs.patch" ) else inherit git-r3 EGIT_REPO_URI="git://git.sv.gnu.org/grub.git 1.314 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.314&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.314&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.313&r2=1.314 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- ChangeLog 7 Sep 2014 19:07:16 -0000 1.313 +++ ChangeLog 9 Sep 2014 19:55:09 -0000 1.314 @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.313 2014/09/07 19:07:16 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.314 2014/09/09 19:55:09 floppym Exp $ + + 09 Sep 2014; Mike Gilbert <flop...@gentoo.org> + +files/grub-2.02_beta2-libzfs.patch, grub-2.02_beta2.ebuild: + Backport build fix for when both device-mapper and libzfs are enabled. Bug + 496608. 07 Sep 2014; Richard Freeman <ri...@gentoo.org> grub-2.02_beta2.ebuild: amd64 stable - 522314