jlec 14/12/04 09:37:37 Modified: metadata.xml ChangeLog Added: grub-2.02_beta2-r4.ebuild Log: sys-boot/grub: Fix QA issues with bash-completions, #526138 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.19 sys-boot/grub/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?r1=1.18&r2=1.19 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/metadata.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- metadata.xml 17 Oct 2013 14:20:15 -0000 1.18 +++ metadata.xml 4 Dec 2014 09:37:37 -0000 1.19 @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>base-system</herd> -<maintainer> - <email>[email protected]</email> -</maintainer> -<maintainer restrict=">=sys-boot/grub-2"> - <email>[email protected]</email> - <name>Mike Gilbert</name> -</maintainer> -<use> - <flag name='device-mapper'> + <herd>base-system</herd> + <maintainer> + <email>[email protected]</email> + </maintainer> + <maintainer restrict=">=sys-boot/grub-2"> + <email>[email protected]</email> + <name>Mike Gilbert</name> + </maintainer> + <use> + <flag name="device-mapper"> Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg> </flag> - <flag name='efiemu'> + <flag name="efiemu"> Build and install the efiemu runtimes </flag> - <flag name='mount'> + <flag name="mount"> Build and install the grub-mount utility </flag> - <flag name='libzfs'> + <flag name="libzfs"> Enable support for <pkg>sys-fs/zfs</pkg> </flag> - <flag name='multislot'> + <flag name="multislot"> Allow concurrent installation of <pkg>sys-boot/grub:0</pkg> and <pkg>sys-boot/grub:2</pkg> by renaming all programs. </flag> -</use> + </use> </pkgmetadata> 1.330 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.330&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.330&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.329&r2=1.330 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- ChangeLog 3 Dec 2014 17:11:07 -0000 1.329 +++ ChangeLog 4 Dec 2014 09:37:37 -0000 1.330 @@ -1,6 +1,12 @@ # 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.329 2014/12/03 17:11:07 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.330 2014/12/04 09:37:37 jlec Exp $ + +*grub-2.02_beta2-r4 (04 Dec 2014) + + 04 Dec 2014; Justin Lecher <[email protected]> +grub-2.02_beta2-r4.ebuild, + +files/grub-2.02_beta2-bash-completions.patch, metadata.xml: + Fix QA issues with bash-completions, #526138 03 Dec 2014; Mike Gilbert <[email protected]> grub-2.02_beta2-r3.ebuild: Stable on x86, bug 522314. Thanks to Poly-C for testing. 1.1 sys-boot/grub/grub-2.02_beta2-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r4.ebuild?rev=1.1&content-type=text/plain Index: grub-2.02_beta2-r4.ebuild =================================================================== # 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-r4.ebuild,v 1.1 2014/12/04 09:37:37 jlec Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 GRUB_AUTOGEN=1 if [[ -n ${GRUB_AUTOGEN} ]]; then PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} ) inherit python-any-r1 fi inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator if [[ ${PV} != 9999 ]]; then if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 MY_P=${P/_/'~'} SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz http://dev.gentoo.org/~floppym/dist/${P}-gentoo.tar.xz"; S=${WORKDIR}/${MY_P} else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz http://dev.gentoo.org/~floppym/dist/${P}.tar.xz"; S=${WORKDIR}/${P%_*} fi KEYWORDS="~amd64 ~x86" PATCHES=() else inherit git-r3 EGIT_REPO_URI="git://git.sv.gnu.org/grub.git http://git.savannah.gnu.org/r/grub.git"; fi DEJAVU=dejavu-sans-ttf-2.34 UNIFONT=unifont-7.0.01 SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="http://www.gnu.org/software/grub/"; # Includes licenses for dejavu and unifont LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" SLOT="2" IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs" GRUB_ALL_PLATFORMS=( # everywhere: emu # mips only: qemu-mips loongson # amd64, x86, ppc, ppc64: ieee1275 # amd64, x86: coreboot multiboot efi-32 pc qemu xen # amd64, ia64: efi-64 ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " DEPEND="${RDEPEND} ${PYTHON_DEPS} app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo grub_platforms_coreboot? ( media-libs/freetype:2 ) grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) test? ( dev-libs/libisoburn app-emulation/qemu ) truetype? ( app-arch/unzip ) " RDEPEND+=" kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !multislot? ( !sys-boot/grub:0 ) nls? ( sys-devel/gettext ) " STRIP_MASK="*/grub/*/*.{mod,img}" RESTRICT="test" QA_EXECSTACK=" usr/bin/grub*-emu* usr/lib*/grub/*/*.mod usr/lib*/grub/*/*.module usr/lib*/grub/*/kernel.exec usr/lib*/grub/*/kernel.img " QA_WX_LOAD=" usr/lib*/grub/*/kernel.exec usr/lib*/grub/*/kernel.img usr/lib*/grub/*/*.image " QA_PRESTRIPPED=" usr/lib.*/grub/.*/kernel.img " pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then # Bug 439082 if ! test-flags-CC -fuse-ld=bfd > /dev/null && $(tc-getLD) --version | grep -q "GNU gold"; then eerror "GRUB does not function correctly when built with the gold linker." eerror "Please select the bfd linker with binutils-config." die "GNU gold detected" fi fi } src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack fi default_src_unpack } src_prepare() { EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" sed -i -e /autoreconf/d autogen.sh || die if use multislot; then # fix texinfo file name, bug 416035 sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die fi epatch "${FILESDIR}"/${P}-bash-completions.patch epatch_user if [[ -n ${GRUB_AUTOGEN} ]]; then python_setup bash autogen.sh || die fi if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then autopoint() { return 0; } eautoreconf fi } setup_fonts() { ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die if use truetype; then ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die fi } grub_configure() { local platform case ${MULTIBUILD_VARIANT} in efi-32) platform=efi if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then local CTARGET=${CTARGET:-i386} fi ;; efi-64) platform=efi if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then local CTARGET=${CTARGET:-x86_64} local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" export TARGET_CFLAGS TARGET_CPPFLAGS fi ;; guessed) ;; *) platform=${MULTIBUILD_VARIANT} ;; esac local myeconfargs=( --disable-werror --program-prefix= --libdir="${EPREFIX}"/usr/lib --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html $(use_enable debug mm-debug) $(use_enable debug grub-emu-usb) $(use_enable device-mapper) $(use_enable mount grub-mount) $(use_enable nls) $(use_enable truetype grub-mkfont) $(use_enable libzfs) $(use sdl && use_enable debug grub-emu-sdl) ${platform:+--with-platform=}${platform} # Let configure detect this where supported $(usex efiemu '' '--disable-efiemu') ) if use multislot; then myeconfargs+=( --program-transform-name="s,grub,grub2," ) fi mkdir -p "${BUILD_DIR}" || die run_in_build_dir setup_fonts autotools-utils_src_configure } src_configure() { # Bug 508758. replace-flags -O3 -O2 # We don't want to leak flags onto boot code. export HOST_CCASFLAGS=${CCASFLAGS} export HOST_CFLAGS=${CFLAGS} export HOST_CPPFLAGS=${CPPFLAGS} export HOST_LDFLAGS=${LDFLAGS} unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS use static && HOST_LDFLAGS+=" -static" export TARGET_LDFLAGS+=" $(test-flags-CC -fuse-ld=bfd)" tc-export CC NM OBJCOPY STRIP export TARGET_CC=${TARGET_CC:-${CC}} tc-export BUILD_CC # Bug 485592 # Portage will take care of cleaning up GRUB_PLATFORMS MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} ) multibuild_parallel_foreach_variant grub_configure } src_compile() { # Sandbox bug 404013. use libzfs && addpredict /etc/dfs:/dev/zfs multibuild_foreach_variant autotools-utils_src_compile use doc && multibuild_for_best_variant \ autotools-utils_src_compile -C docs html } src_test() { # The qemu dependency is a bit complex. # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. multibuild_foreach_variant autotools-utils_src_test } src_install() { multibuild_foreach_variant autotools-utils_src_install \ bashcompletiondir="$(get_bashcompdir)" mv "${ED}"/$(get_bashcompdir)/grub{,-install} || die bashcomp_alias grub-install \ grub2-set-default \ grub2-mkrescue \ grub2-reboot \ grub2-script-check \ grub2-editenv \ grub2-sparc64-setup \ grub2-mkfont \ grub2-mkpasswd-pbkdf2 \ grub2-mkimage \ grub2-bios-setup \ grub2-mkconfig \ grub2-probe use doc && multibuild_for_best_variant run_in_build_dir \ emake -C docs DESTDIR="${D}" install-html if use multislot; then mv "${ED%/}"/usr/share/info/grub{,2}.info || die fi insinto /etc/default newins "${FILESDIR}"/grub.default-3 grub } pkg_postinst() { mount-boot_mount_boot_partition if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then mkdir -p "${ROOT%/}/boot/grub" ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg" fi fi mount-boot_pkg_postinst elog "For information on how to configure GRUB2 please refer to the guide:" elog " http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"; if has_version 'sys-boot/grub:0'; then elog "A migration guide for GRUB Legacy users is available:" elog " http://www.gentoo.org/doc/en/grub2-migration.xml"; fi if [[ -z ${REPLACING_VERSIONS} ]]; then 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 using grub2-mkrescue." fi fi }
