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 1SZsu4-0002vC-DL for garchives@archives.gentoo.org; Thu, 31 May 2012 00:06:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7441E08B1; Thu, 31 May 2012 00:06:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B1EAE08B1 for ; Thu, 31 May 2012 00:06:04 +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 222201B4022 for ; Thu, 31 May 2012 00:06:03 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id CDA4E2004B; Thu, 31 May 2012 00:06:01 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-0.97-r12.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: grub-0.97-r12.ebuild ChangeLog X-VCS-Directories: sys-boot/grub X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120531000601.CDA4E2004B@flycatcher.gentoo.org> Date: Thu, 31 May 2012 00:06:01 +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: 7f1c91ef-cba7-4b14-9eaf-4ef330520d3f X-Archives-Hash: f9a2ae84d1449ad85c0e22eed29b52e7 vapier 12/05/31 00:06:01 Modified: ChangeLog Added: grub-0.97-r12.ebuild Log: Build stage1/stage2 with -march=3Di[3456]86 based on target tuple to ke= ep SSE/etc... insns from sneaking into the generated output #360513#115. =20 (Portage version: HEAD/cvs/Linux x86_64) Revision Changes Path 1.207 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.207&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.207&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?r1=3D1.206&r2=3D1.207 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.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- ChangeLog 31 May 2012 00:01:18 -0000 1.206 +++ ChangeLog 31 May 2012 00:06:01 -0000 1.207 @@ -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.206 2012/= 05/31 00:01:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.207 2012/= 05/31 00:06:01 vapier Exp $ + +*grub-0.97-r12 (31 May 2012) + + 31 May 2012; Mike Frysinger +grub-0.97-r12.ebuild: + Build stage1/stage2 with -march=3Di[3456]86 based on target tuple to k= eep + SSE/etc... insns from sneaking into the generated output #360513#115. =20 31 May 2012; Mike Frysinger grub-0.97-r3.ebuild, grub-0.97-r4.ebuild, grub-0.97-r5.ebuild, grub-0.97-r6.ebuild, 1.1 sys-boot/grub/grub-0.97-r12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -0.97-r12.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -0.97-r12.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: grub-0.97-r12.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-0.97-r12.ebuild,v 1= .1 2012/05/31 00:06:01 vapier Exp $ # XXX: we need to review menu.lst vs grub.conf handling. We've been conv= erting # all systems to grub.conf (and symlinking menu.lst to grub.conf), b= ut # we never updated any of the source code (it still all wants menu.l= st), # and there is no indication that upstream is making the transition. # If you need to roll a new grub-static distfile, here is how. # - Robin H. Johnson - 29 Nov 2010 # USE=3D'static -ncurses -netboot -custom-cflags' \ # GRUB_STATIC_PACKAGE_BUILDING=3D1 ebuild \ # grub-${PVR}.ebuild package && \ # cp -f ${PKGDIR}/${CAT}/${PF}.tbz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2 inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-in= fo pax-utils PATCHVER=3D"1.14" # Should match the revision ideally DESCRIPTION=3D"GNU GRUB Legacy boot loader" HOMEPAGE=3D"http://www.gnu.org/software/grub/" SRC_URI=3D"mirror://gentoo/${P}.tar.gz mirror://gnu-alpha/${PN}/${P}.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd" IUSE=3D"custom-cflags ncurses netboot static" RDEPEND=3D"ncurses? ( >=3Dsys-libs/ncurses-5.2-r5 amd64? ( app-emulation/emul-linux-x86-baselibs ) )" DEPEND=3D"${RDEPEND}" pkg_setup() { case $(tc-arch) in amd64) CONFIG_CHECK=3D'~IA32_EMULATION' check_extra_config ;; esac } src_unpack() { unpack ${A} cd "${S}" # Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as # discovered in bug 160801. We can change this, however, using larger va= lues # for this variable means that Grub needs more memory to run and boot. F= or a # kernel of size N, Grub needs (N+1)*2. Advanced users should set a cus= tom # value in make.conf, it is possible to make kernels ~16Mb in size, but = it # needs the kitchen sink built-in. local t=3D"custom" if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then case $(tc-arch) in amd64) GRUB_MAX_KERNEL_SIZE=3D9 ;; x86) GRUB_MAX_KERNEL_SIZE=3D5 ;; esac t=3D"default" fi einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERN= EL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)" sed -i \ -e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \ "${S}"/grub/asmstub.c \ || die if [[ -n ${PATCHVER} ]] ; then EPATCH_SUFFIX=3D"patch" epatch "${WORKDIR}"/patch eautoreconf fi } src_compile() { filter-flags -fPIE #168834 use amd64 && multilib_toolchain_setup x86 unset BLOCK_SIZE #73499 ### i686-specific code in the boot loader is a bad idea; disabling to en= sure ### at least some compatibility if the hard drive is moved to an older o= r ### incompatible system. # grub-0.95 added -fno-stack-protector detection, to disable ssp for sta= ge2, # but the objcopy's (faulty) test fails if -fstack-protector is default. # create a cache telling configure that objcopy is ok, and add -C to eco= nf # to make use of the cache. # # CFLAGS has to be undefined running econf, else -fno-stack-protector de= tection fails. # STAGE2_CFLAGS is not allowed to be used on emake command-line, it over= writes # -fno-stack-protector detected by configure, removed from netboot's ema= ke. use custom-cflags || unset CFLAGS export grub_cv_prog_objcopy_absolute=3Dyes #79734 use static && append-ldflags -static # Per bug 216625, the emul packages do not provide .a libs for performin= g # suitable static linking if use amd64 && use static ; then if [ -z "${GRUB_STATIC_PACKAGE_BUILDING}" ]; then die "You must use the grub-static package if you want a static Grub on= amd64!" else eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This" eerror "is specifically intended for building the tarballs for the" eerror "grub-static package via USE=3D'static -ncurses'." eerror "All bets are now off." ebeep 10 fi fi # build the net-bootable grub first, but only if "netboot" is set if use netboot ; then econf \ --libdir=3D/lib \ --datadir=3D/usr/lib/grub \ --exec-prefix=3D/ \ --disable-auto-linux-mem-opt \ --enable-diskless \ --enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \ --enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \ --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \ --enable-{tulip,via-rhine,w89c840} emake w89c840_o_CFLAGS=3D"-O" || die mv -f stage2/{nbgrub,pxegrub} "${S}"/ mv -f stage2/stage2 stage2/stage2.netboot emake -j1 clean || die fi # Now build the regular grub # Note that FFS and UFS2 support are broken for now - stage1_5 files too= big econf \ --libdir=3D/lib \ --datadir=3D/usr/lib/grub \ --exec-prefix=3D/ \ --disable-auto-linux-mem-opt \ $(use_with ncurses curses) # sanity check due to common failure use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=3Dncu= rses but curses not found" emake || die "making regular stuff" } src_test() { # non-default block size also give false pass/fails. unset BLOCK_SIZE emake -j1 check || die } src_install() { emake DESTDIR=3D"${D}" install || die if use netboot ; then exeinto /usr/lib/grub/${CHOST} doexe nbgrub pxegrub stage2/stage2.netboot || die fi # bug 330745 pax-mark -m "${D}"/sbin/grub dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO newdoc docs/menu.lst grub.conf.sample dodoc "${FILESDIR}"/grub.conf.gentoo prepalldocs [ -n "${GRUB_STATIC_PACKAGE_BUILDING}" ] && \ mv \ "${D}"/usr/share/doc/${PF} \ "${D}"/usr/share/doc/grub-static-${PF/grub-} insinto /usr/share/grub doins "${DISTDIR}"/splash.xpm.gz } setup_boot_dir() { local boot_dir=3D$1 local dir=3D${boot_dir} mkdir -p "${dir}" [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" dir=3D"${dir}/grub" if [[ ! -e ${dir} ]] ; then mkdir "${dir}" || die fi # change menu.lst to grub.conf if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then mv -f "${dir}"/menu.lst "${dir}"/grub.conf ewarn ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" ewarn fi if [[ ! -e ${dir}/menu.lst ]]; then einfo "Linking from new grub.conf name to menu.lst" ln -snf grub.conf "${dir}"/menu.lst fi if [[ -e ${dir}/stage2 ]] ; then mv "${dir}"/stage2{,.old} ewarn "*** IMPORTANT NOTE: you must run grub and install" ewarn "the new version's stage1 to your MBR. Until you do," ewarn "stage1 and stage2 will still be the old version, but" ewarn "later stages will be the new version, which could" ewarn "cause problems such as an unbootable system." ewarn "This means you must use either grub-install or perform" ewarn "root/setup manually! For more help, see the handbook:" ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=3D= 1&chap=3D10#grub-install-auto" ebeep fi einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub t= o ${dir}" for x in \ "${ROOT}"/lib*/grub/*/* \ "${ROOT}"/usr/lib*/grub/*/* \ "${ROOT}"/usr/share/grub/* ; do [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ done if [[ ! -e ${dir}/grub.conf ]] ; then s=3D"${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo" [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf fi # Per bug 218599, we support grub.conf.install for users that want to ru= n a # specific set of Grub setup commands rather than the default ones. grub_config=3D${dir}/grub.conf.install [[ -e ${grub_config} ]] || grub_config=3D${dir}/grub.conf if [[ -e ${grub_config} ]] ; then egrep \ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|tim= eout|title)' \ "${grub_config}" | \ /sbin/grub --batch \ --device-map=3D"${dir}"/device.map \ > /dev/null fi # the grub default commands silently piss themselves if # the default file does not exist ahead of time if [[ ! -e ${dir}/default ]] ; then grub-set-default --root-directory=3D"${boot_dir}" default fi einfo "Grub has been installed to ${boot_dir} successfully." } pkg_postinst() { mount-boot_mount_boot_partition if [[ -n ${DONT_MOUNT_BOOT} ]]; then elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" elog "the following instructions for your /boot!" elog "Neglecting to do so may cause your system to fail to boot!" elog else setup_boot_dir "${ROOT}"/boot # Trailing output because if this is run from pkg_postinst, it gets mix= ed into # the other output. einfo "" fi elog "To interactively install grub files to another device such as a US= B" elog "stick, just run the following and specify the directory as prompte= d:" elog " emerge --config =3D${PF}" elog "Alternately, you can export GRUB_ALT_INSTALLDIR=3D/path/to/use to = tell" elog "grub where to install in a non-interactive way." # needs to be after we call setup_boot_dir mount-boot_pkg_postinst } pkg_config() { local dir if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then einfo "Enter the directory where you want to setup grub:" read dir else dir=3D"${GRUB_ALT_INSTALLDIR}" fi setup_boot_dir "${dir}" }