From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Saqqy-0006w9-Gm for garchives@archives.gentoo.org; Sat, 02 Jun 2012 16:07:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7977AE060D; Sat, 2 Jun 2012 16:06:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 34418E060D for ; Sat, 2 Jun 2012 16:06:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63A741B4003 for ; Sat, 2 Jun 2012 16:06:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 192FC2004B; Sat, 2 Jun 2012 16:06:49 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00_beta6.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: grub-9999.ebuild grub-2.00_beta6.ebuild ChangeLog X-VCS-Directories: sys-boot/grub X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Message-Id: <20120602160649.192FC2004B@flycatcher.gentoo.org> Date: Sat, 2 Jun 2012 16:06:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5b79db19-b1f9-47f6-9542-888cedc6a159 X-Archives-Hash: 7d54f66443f293c792fb671aa1806c5f floppym 12/06/02 16:06:49 Modified: grub-9999.ebuild ChangeLog Added: grub-2.00_beta6.ebuild Log: Version bump. Fix links in grub2.info. #416035 by Martin V=C3=A4th. =20 (Portage version: 2.2.0_alpha108/cvs/Linux x86_64) Revision Changes Path 1.65 sys-boot/grub/grub-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.65&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.65&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?r1=3D1.64&r2=3D1.65 Index: grub-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- grub-9999.ebuild 18 May 2012 15:01:23 -0000 1.64 +++ grub-9999.ebuild 2 Jun 2012 16:06:48 -0000 1.65 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.64= 2012/05/18 15:01:23 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.65= 2012/06/02 16:06:48 floppym Exp $ =20 EAPI=3D4 =20 @@ -198,6 +198,12 @@ src_prepare() { local i j =20 + # fix texinfo file name, bug 416035 + sed -i \ + -e 's/^\* GRUB:/* GRUB2:/' \ + -e 's/(grub)/(grub2)/' -- \ + "${S}"/docs/grub.texi + epatch_user =20 # autogen.sh does more than just run autotools 1.209 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.209&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.209&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?r1=3D1.208&r2=3D1.209 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- ChangeLog 2 Jun 2012 06:37:34 -0000 1.208 +++ ChangeLog 2 Jun 2012 16:06:48 -0000 1.209 @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.208 2012/= 06/02 06:37:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.209 2012/= 06/02 16:06:48 floppym Exp $ + +*grub-2.00_beta6 (02 Jun 2012) + + 02 Jun 2012; Mike Gilbert +grub-2.00_beta6.ebuild= , + grub-9999.ebuild: + Version bump. Fix links in grub2.info. #416035 by Martin V=C3=A4th. =20 02 Jun 2012; Mike Frysinger grub-0.97-r12.ebuild: Expand insns for creating grub-static binpkg so it runs more smoothly. 1.1 sys-boot/grub/grub-2.00_beta6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00_beta6.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00_beta6.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: grub-2.00_beta6.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta6.ebuild,v= 1.1 2012/06/02 16:06:48 floppym Exp $ EAPI=3D4 if [[ ${PV} =3D=3D "9999" ]] ; then EBZR_REPO_URI=3D"http://bzr.savannah.gnu.org/r/grub/trunk/grub/" LIVE_ECLASS=3D"bzr" SRC_URI=3D"" DO_AUTORECONF=3D"true" else MY_P=3D${P/_/\~} if [[ ${PV} =3D=3D *_alpha* || ${PV} =3D=3D *_beta* ]]; then SRC_URI=3D"mirror://gnu-alpha/${PN}/${MY_P}.tar.xz" else SRC_URI=3D"mirror://gnu/${PN}/${MY_P}.tar.xz mirror://gentoo/${MY_P}.tar.xz" fi # Masked until documentation guys consolidate the guide and approve # it for usage. #KEYWORDS=3D"~amd64 ~mips ~x86" S=3D${WORKDIR}/${MY_P} fi inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+au= totools} ${LIVE_ECLASS} unset LIVE_ECLASS DESCRIPTION=3D"GNU GRUB boot loader" HOMEPAGE=3D"http://www.gnu.org/software/grub/" LICENSE=3D"GPL-3" SLOT=3D"2" IUSE=3D"custom-cflags debug device-mapper efiemu mount nls static sdl tru= etype libzfs" GRUB_PLATFORMS=3D( # everywhere: emu # mips only: qemu-mips yeeloong # amd64, x86, ppc, ppc64: ieee1275 # amd64, x86: coreboot multiboot efi-32 pc qemu # amd64, ia64: efi-64 ) IUSE+=3D" ${GRUB_PLATFORMS[@]/#/grub_platforms_}" # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=3D" dev-libs/lzo >=3Dsys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=3Dsys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=3Dmedia-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " DEPEND=3D"${RDEPEND} >=3Ddev-lang/python-2.5.2 sys-devel/flex virtual/yacc sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) " RDEPEND+=3D" grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) " if [[ -n ${DO_AUTORECONF} ]] ; then DEPEND+=3D" >=3Dsys-devel/autogen-5.10 sys-apps/help2man" else DEPEND+=3D" app-arch/xz-utils" fi export STRIP_MASK=3D"*/grub/*/*.{mod,img}" QA_EXECSTACK=3D" usr/bin/grub* usr/sbin/grub* usr/lib*/grub/*/*.mod usr/lib*/grub/*/kernel.exec usr/lib*/grub/*/kernel.img usr/lib*/grub/*/setjmp.module " QA_WX_LOAD=3D" usr/lib*/grub/*/kernel.exec usr/lib*/grub/*/kernel.img usr/lib*/grub/*/*.image " QA_PRESTRIPPED=3D" usr/lib.*/grub/.*/kernel.img " grub_run_phase() { local phase=3D$1 local platform=3D$2 [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platfor= m]" [[ -d "${WORKDIR}/build-${platform}" ]] || \ { mkdir "${WORKDIR}/build-${platform}" || die ; } pushd "${WORKDIR}/build-${platform}" > /dev/null || die echo ">>> Running ${phase} for platform \"${platform}\"" echo ">>> Working in: \"${WORKDIR}/build-${platform}\"" grub_${phase} ${platform} popd > /dev/null || die } grub_src_configure() { local platform=3D$1 local with_platform=3D [[ -z ${platform} ]] && die "${FUNCNAME} [platform]" # Used below for efi cross-building tc-export CC NM OBJCOPY STRIP estack_push CTARGET "${CTARGET}" estack_push TARGET_CC "${TARGET_CC}" estack_push TARGET_CFLAGS "${TARGET_CFLAGS}" estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}" case ${platform} in efi-32) if [[ ${CHOST} =3D=3D x86_64* ]]; then CTARGET=3D"${CTARGET:-i386}" TARGET_CC=3D"${TARGET_CC:-${CC}}" export TARGET_CC fi with_platform=3D"--with-platform=3Defi" ;; efi-64) if [[ ${CHOST} =3D=3D i?86* ]]; then CTARGET=3D"${CTARGET:-x86_64}" TARGET_CC=3D"${TARGET_CC:-${CC}}" TARGET_CFLAGS=3D"-Os -march=3Dx86-64 ${TARGET_CFLAGS}" TARGET_CPPFLAGS=3D"-march=3Dx86-64 ${TARGET_CPPFLAGS}" export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS fi with_platform=3D"--with-platform=3Defi" ;; guessed) ;; *) with_platform=3D"--with-platform=3D${platform}" ;; esac ECONF_SOURCE=3D"${S}" \ econf \ --disable-werror \ --program-prefix=3D \ --program-transform-name=3D"s,grub,grub2," \ --with-grubdir=3Dgrub2 \ ${with_platform} \ $(use_enable debug mm-debug) \ $(use_enable debug grub-emu-usb) \ $(use_enable device-mapper) \ $(use_enable efiemu) \ $(use_enable mount grub-mount) \ $(use_enable nls) \ $(use_enable truetype grub-mkfont) \ $(use_enable libzfs) \ $(use sdl && use_enable debug grub-emu-sdl) estack_pop CTARGET CTARGET || die estack_pop TARGET_CC TARGET_CC || die estack_pop TARGET_CFLAGS TARGET_CFLAGS || die estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die } grub_src_compile() { default_src_compile pax-mark -mpes "${grub_binaries[@]}" } grub_src_install() { default_src_install } src_prepare() { local i j # fix texinfo file name, bug 416035 sed -i \ -e 's/^\* GRUB:/* GRUB2:/' \ -e 's/(grub)/(grub2)/' -- \ "${S}"/docs/grub.texi epatch_user # autogen.sh does more than just run autotools if [[ -n ${DO_AUTORECONF} ]] ; then sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die (. ./autogen.sh) || die fi # install into the right dir for eselect #372735 sed -i \ -e '/^bashcompletiondir =3D/s:=3D.*:=3D $(datarootdir)/bash-completion:= ' \ util/bash-completion.d/Makefile.in || die # get enabled platforms GRUB_ENABLED_PLATFORMS=3D"" for i in ${GRUB_PLATFORMS[@]}; do use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=3D" ${i}" done [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS=3D"guessed" elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}" } src_configure() { local i use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS use libzfs && addpredict /etc/dfs use static && append-ldflags -static for i in ${GRUB_ENABLED_PLATFORMS}; do grub_run_phase ${FUNCNAME} ${i} done } src_compile() { # Used for pax marking in grub_src_compile local grub_binaries=3D( grub-editenv grub-fstest grub-menulst2cfg grub-mkimage grub-mklayout grub-mkpasswd-pbkdf2 grub-mkrelpath grub-script-check grub-bios-setup grub-ofpathname grub-probe grub-sparc64-setup ) use mount && grub_binaries+=3D( grub-mount ) use truetype && grub_binaries+=3D( grub-mkfont ) local i for i in ${GRUB_ENABLED_PLATFORMS}; do grub_run_phase ${FUNCNAME} ${i} done } src_install() { local i for i in ${GRUB_ENABLED_PLATFORMS}; do grub_run_phase ${FUNCNAME} ${i} done mv "${ED}"usr/share/info/grub{,2}.info || die # can't be in docs array as we use default_src_install in different buil= ddir dodoc AUTHORS ChangeLog NEWS README THANKS TODO insinto /etc/default newins "${FILESDIR}"/grub.default grub } pkg_postinst() { # display the link to guide elog "For information on how to configure grub-2 please refer to the gui= de:" elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start" if ! has_version sys-boot/os-prober; then elog "Install sys-boot/os-prober to enable detection of other operating= systems using grub2-mkconfig." fi if ! has_version dev-libs/libisoburn; then elog "Install dev-libs/libisoburn to enable creation of rescue media us= ing grub2-mkrescue." fi }