public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/multilib-portage:master commit in: sys-boot/grub/
@ 2012-03-12 22:37 Nathan Phillip Brink
  0 siblings, 0 replies; 2+ messages in thread
From: Nathan Phillip Brink @ 2012-03-12 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b663efd1b451ea3f39e6a4cab4f24e63ca3fc953
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 22:37:14 2012 +0000
Commit:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 22:37:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=commit;h=b663efd1

sys-boot/grub: Import sys-boot/grub-0.97-r10 without the app-emulation/emul-linux-x86-baselibs {R,}DEPEND (unnecessary with multilib-portage).

(Portage version: 2.2.0_alpha90-r1/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 6BA81050)

---
 sys-boot/grub/Manifest             |   25 +++
 sys-boot/grub/grub-0.97-r10.ebuild |  290 ++++++++++++++++++++++++++++++++++++
 sys-boot/grub/metadata.xml         |   26 ++++
 3 files changed, 341 insertions(+), 0 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
new file mode 100644
index 0000000..f509a79
--- /dev/null
+++ b/sys-boot/grub/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST grub-0.97-patches-1.12.tar.bz2 55811 RMD160 035ab02c920c82bae57e094bc3649d4681f2a93e SHA1 c5a11a17748c33ee2bcb612de8fa6c30014e5143 SHA256 80cedf74d29e334182d8fb906035d2c365b96b6e8a09bbe800f44f98c828ac97
+DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
+DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
+EBUILD grub-0.97-r10.ebuild 9400 RMD160 887269dd44da83e0e7028f0c054106da1aa33f3e SHA1 7a54dc39df4bb87555f1e8ded16101657471daf8 SHA256 2fa87730cb24815067906705aca056a899dd48f42623127abc0bb736a54c769a
+MISC metadata.xml 664 RMD160 c0c23f53a00cb5f2e6430a6f4b88ef706a1b1205 SHA1 35219036bfa00388de5986c55d51071b510eeaf7 SHA256 be21a828786159bf7aac3b067866c9f2fef4826be0077abf7d88d977e9b4ba60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPXnqaAAoJEHQ6UuhrqBBQc1EP/RgAVKn8subwhOg8z5Qzlu3f
+uHmeV+rfrEX3F8HakjW2L7QtkX490nLfX1L7TdjypnFVLlXpa70EoYZLGlcrK/q9
+bpNiKnxG40zT//+VhM4toyL3mSgEyaOkShbBJ2aCg5u6stfDBYzXGohOHGlMo6OU
+Nk6C1EUPIxm3Sldiv2d2FVrj0NvtvVAV4FBQq3QrhobuN+LTLWvl5m9ZichA+tEL
+303Vi6HYT/XsIrwBIMLsEAy7ypb5OhM78bCc+mzKDyfsJ9ExLmS0Yv9mB2vu9ol7
+SB658maHxDy/DMOQZ4t8h/AzZ3AWWYUhr00eBURr12H/XddI5DHynruxlTBPyFLO
+jCW7C2kmx+FthAzzw834buuqnJi3CZopKZuPMoU1vu5SHxR5RokkxbKfUzEUVJsq
+PJ/6fz0Mhy7A/tL2dnOKRTZtnYGrY86G7pn8QpSWsc/35XDMsvFlXIXtwNILxNn3
+KaA8IWI6IBqiv+asKahDt4PayPDxgmOs4kBVCXgqG2y539qkYV41NmLyo2zO9AMl
+ojd8QJeXW8lqlOQ9HFX5DXyl9Sd8XSQ/xakEKxeMh2VAxsKSw/zeIFq14KMogfFe
+xatNLipeFSx2GpkWbiu/KFxUgcIcCAQAdZR+5lsvsaPbm7RiYHlmhZuax+MNVTnC
+R17RiisOyMoFSAh1D9wE
+=1bAl
+-----END PGP SIGNATURE-----

diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
new file mode 100644
index 0000000..03583f9
--- /dev/null
+++ b/sys-boot/grub/grub-0.97-r10.ebuild
@@ -0,0 +1,290 @@
+# 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-r10.ebuild,v 1.13 2012/02/29 23:09:30 floppym Exp $
+
+# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
+#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
+#      we never updated any of the source code (it still all wants menu.lst),
+#      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 <robbat2@gentoo.org> - 29 Nov 2010
+# USE='static -ncurses -netboot -custom-cflags' \
+# GRUB_STATIC_PACKAGE_BUILDING=1 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-info pax-utils
+
+PATCHVER="1.12" # Should match the revision ideally
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="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="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="custom-cflags ncurses netboot static"
+
+RDEPEND="ncurses? (
+		>=sys-libs/ncurses-5.2-r5
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local arch="$(tc-arch)"
+	case ${arch} in
+		amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+	esac
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patch breaks booting for some people #111885
+	rm "${WORKDIR}"/patch/400_*reiser4*
+
+	# Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
+	# discovered in bug 160801. We can change this, however, using larger values
+	# for this variable means that Grub needs more memory to run and boot. For a
+	# kernel of size N, Grub needs (N+1)*2.  Advanced users should set a custom
+	# value in make.conf, it is possible to make kernels ~16Mb in size, but it
+	# needs the kitchen sink built-in.
+	local t="custom"
+	if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
+		case $(tc-arch) in
+			amd64) GRUB_MAX_KERNEL_SIZE=9 ;;
+			x86)   GRUB_MAX_KERNEL_SIZE=5 ;;
+		esac
+		t="default"
+	fi
+	einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
+
+	sed -i \
+		-e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
+		"${S}"/grub/asmstub.c \
+		|| die "Failed to hack memory size"
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SUFFIX="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 ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# 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 econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# Per bug 216625, the emul packages do not provide .a libs for performing
+	# 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='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=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--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} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		$(use_with ncurses curses) \
+		|| die "econf failed"
+
+	# sanity check due to common failure
+	use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
+
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+	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=$1
+	local dir=${boot_dir}
+
+	mkdir -p "${dir}"
+	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
+	dir="${dir}/grub"
+	if [[ ! -e ${dir} ]] ; then
+		mkdir "${dir}" || die "${dir} does not exist!"
+	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=1&chap=10#grub-install-auto"
+		ebeep
+	fi
+
+	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${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="${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 run a
+	# specific set of Grub setup commands rather than the default ones.
+	grub_config=${dir}/grub.conf.install
+	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
+	if [[ -e ${grub_config} ]] ; then
+		egrep \
+			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+			"${grub_config}" | \
+		/sbin/grub --batch \
+			--device-map="${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="${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 mixed into
+		# the other output.
+		einfo ""
+	fi
+	elog "To interactively install grub files to another device such as a USB"
+	elog "stick, just run the following and specify the directory as prompted:"
+	elog "   emerge --config =${PF}"
+	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/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="${GRUB_ALT_INSTALLDIR}"
+	fi
+	setup_boot_dir "${dir}"
+}

diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
new file mode 100644
index 0000000..7911770
--- /dev/null
+++ b/sys-boot/grub/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>binki@gentoo.org</email>
+    <name>Nathan Phillip Brink</name>
+  </maintainer>
+  <maintainer>
+    <email>tommy@gentoo.org</email>
+    <name>Thomas Sachau</name>
+  </maintainer>
+<use>
+	<flag name='device-mapper'>
+		Enable support for <pkg>sys-fs/device-mapper</pkg>
+	</flag>
+	<flag name='efiemu'>
+		Build and install the efiemu runtimes
+	</flag>
+	<flag name='mount'>
+		Build and install the grub-mount utility
+	</flag>
+	<flag name='libzfs'>
+		Enable support for <pkg>sys-fs/zfs</pkg>
+	</flag>
+</use>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/multilib-portage:master commit in: sys-boot/grub/
@ 2015-06-16 23:49 Thomas Sachau
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Sachau @ 2015-06-16 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     27c04c24b53b834e884156f53ce7de9dc6f9cd14
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 23:49:00 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 23:49:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=27c04c24

Update overlay version of grub-0.97 with adjusted dependencies

 sys-boot/grub/Manifest             |  32 +----
 sys-boot/grub/grub-0.97-r14.ebuild | 288 +++++++++++++++++++++++++++++++++++++
 sys-boot/grub/metadata.xml         |  14 --
 3 files changed, 295 insertions(+), 39 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f509a79..44e565b 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST grub-0.97-patches-1.12.tar.bz2 55811 RMD160 035ab02c920c82bae57e094bc3649d4681f2a93e SHA1 c5a11a17748c33ee2bcb612de8fa6c30014e5143 SHA256 80cedf74d29e334182d8fb906035d2c365b96b6e8a09bbe800f44f98c828ac97
-DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
-DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
-EBUILD grub-0.97-r10.ebuild 9400 RMD160 887269dd44da83e0e7028f0c054106da1aa33f3e SHA1 7a54dc39df4bb87555f1e8ded16101657471daf8 SHA256 2fa87730cb24815067906705aca056a899dd48f42623127abc0bb736a54c769a
-MISC metadata.xml 664 RMD160 c0c23f53a00cb5f2e6430a6f4b88ef706a1b1205 SHA1 35219036bfa00388de5986c55d51071b510eeaf7 SHA256 be21a828786159bf7aac3b067866c9f2fef4826be0077abf7d88d977e9b4ba60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPXnqaAAoJEHQ6UuhrqBBQc1EP/RgAVKn8subwhOg8z5Qzlu3f
-uHmeV+rfrEX3F8HakjW2L7QtkX490nLfX1L7TdjypnFVLlXpa70EoYZLGlcrK/q9
-bpNiKnxG40zT//+VhM4toyL3mSgEyaOkShbBJ2aCg5u6stfDBYzXGohOHGlMo6OU
-Nk6C1EUPIxm3Sldiv2d2FVrj0NvtvVAV4FBQq3QrhobuN+LTLWvl5m9ZichA+tEL
-303Vi6HYT/XsIrwBIMLsEAy7ypb5OhM78bCc+mzKDyfsJ9ExLmS0Yv9mB2vu9ol7
-SB658maHxDy/DMOQZ4t8h/AzZ3AWWYUhr00eBURr12H/XddI5DHynruxlTBPyFLO
-jCW7C2kmx+FthAzzw834buuqnJi3CZopKZuPMoU1vu5SHxR5RokkxbKfUzEUVJsq
-PJ/6fz0Mhy7A/tL2dnOKRTZtnYGrY86G7pn8QpSWsc/35XDMsvFlXIXtwNILxNn3
-KaA8IWI6IBqiv+asKahDt4PayPDxgmOs4kBVCXgqG2y539qkYV41NmLyo2zO9AMl
-ojd8QJeXW8lqlOQ9HFX5DXyl9Sd8XSQ/xakEKxeMh2VAxsKSw/zeIFq14KMogfFe
-xatNLipeFSx2GpkWbiu/KFxUgcIcCAQAdZR+5lsvsaPbm7RiYHlmhZuax+MNVTnC
-R17RiisOyMoFSAh1D9wE
-=1bAl
------END PGP SIGNATURE-----
+DIST grub-0.97-patches-1.12.tar.bz2 55811 SHA256 80cedf74d29e334182d8fb906035d2c365b96b6e8a09bbe800f44f98c828ac97
+DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
+DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
+DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
+EBUILD grub-0.97-r10.ebuild 9400 SHA256 2fa87730cb24815067906705aca056a899dd48f42623127abc0bb736a54c769a SHA512 a33fba52bdea688dc7c483b3130aa547dc2284d30c62e67e19d81dab45f8ce21300eefa7d594149535d2ce3113776a39bce258ba5c070d0ac43c62da170ffdf5 WHIRLPOOL 994c6a7653d7fc1ec5e1658ca7e0306e1a9b689914df5b4a977399af4c9cbeac834251510566715eb2f48e44810966e16eb82b5a7d1aee888f6d15a5bb3a8914
+EBUILD grub-0.97-r14.ebuild 9203 SHA256 3e7ff7cfb1602577ed23788f2267b4f8aeb168cbd392813e3bcbea0dfc047200 SHA512 5a321126ff9d30551f5ea7ab22dc318e8c1b77a10d855268504762a1c0f5f1e1a0e2f119c837b37b4b16e5f33fd322840d8bdf37943d1a778bc0983c76464f0a WHIRLPOOL 69af838a47fae54ab17c6a0791a2c8f40913493f899d908b04bb4a8e428942c9d35c3e380f654b15b13591c376bc8cd33cebe133da65b6844364b03cef29f771
+MISC metadata.xml 342 SHA256 af2c5801517ebc9cd93377058185f6ec448c036703e6ba189d7afd86f61b8e47 SHA512 bb1798fe58a844d43cf3051e1e27bdbf51bb6a7229f594fd249efe36e1e675d49f05ce94206d80acecddec0efd4a9b64f6bf34d287164980afb81c7c082edec9 WHIRLPOOL c5fe35fb98ea7bab573bde308e8251134a960c394a609afaa4b7334d70f7671e15c22ae0636f51bc090706cace4162a67a107ab7b90dc555c7c45901e37742c9

diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r14.ebuild
new file mode 100644
index 0000000..e852e7b
--- /dev/null
+++ b/sys-boot/grub/grub-0.97-r14.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.8 2015/06/14 20:36:32 ulm Exp $
+
+# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
+#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
+#      we never updated any of the source code (it still all wants menu.lst),
+#      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 <robbat2@gentoo.org> - 29 Nov 2010
+# FEATURES='-noauto -noinfo -nodoc -noman -splitdebug nostrip' \
+# USE='static -ncurses -netboot -custom-cflags' \
+# PORTAGE_COMPRESS=true GRUB_STATIC_PACKAGE_BUILDING=1 ebuild \
+# grub-${PVR}.ebuild clean package && \
+# qtbz2 -s -j ${PKGDIR}/${CAT}/${PF}.tbz2 && \
+# mv ${PF}.tar.bz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2
+
+EAPI="4"
+
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+
+PATCHVER="1.14" # Should match the revision ideally
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="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="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="custom-cflags ncurses netboot static"
+
+LIB_DEPEND="ncurses? (
+		>=sys-libs/ncurses-5.9-r3[static-libs(+)]
+	)"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)\]/} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+	case $(tc-arch) in
+	amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+	esac
+}
+
+src_prepare() {
+	# Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
+	# discovered in bug 160801. We can change this, however, using larger values
+	# for this variable means that Grub needs more memory to run and boot. For a
+	# kernel of size N, Grub needs (N+1)*2.  Advanced users should set a custom
+	# value in make.conf, it is possible to make kernels ~16Mb in size, but it
+	# needs the kitchen sink built-in.
+	local t="custom"
+	if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
+		case $(tc-arch) in
+		amd64) GRUB_MAX_KERNEL_SIZE=9 ;;
+		x86)   GRUB_MAX_KERNEL_SIZE=5 ;;
+		esac
+		t="default"
+	fi
+	einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
+
+	sed -i \
+		-e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
+		"${S}"/grub/asmstub.c \
+		|| die
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
+	eautoreconf
+}
+
+src_configure() {
+	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 ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# 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 econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	tc-ld-disable-gold #439082 #466536 #526348
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	if use amd64 && use static ; then
+		if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
+			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='static -ncurses'."
+			eerror "All bets are now off."
+		fi
+	fi
+
+	multijob_init
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		(
+		multijob_child_init
+		mkdir -p "${WORKDIR}"/netboot
+		pushd "${WORKDIR}"/netboot >/dev/null
+		ECONF_SOURCE=${S} \
+		econf \
+			--libdir=/lib \
+			--datadir=/usr/lib/grub \
+			--exec-prefix=/ \
+			--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}
+		popd >/dev/null
+		) &
+		multijob_post_fork
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--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=ncurses but curses not found"
+
+	multijob_finish
+}
+
+src_compile() {
+	use netboot && emake -C "${WORKDIR}"/netboot w89c840_o_CFLAGS="-O"
+	emake
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	emake -j1 check
+}
+
+src_install() {
+	default
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe "${WORKDIR}"/netboot/stage2/{nbgrub,pxegrub}
+		newexe "${WORKDIR}"/netboot/stage2/stage2 stage2.netboot
+	fi
+
+	pax-mark -m "${D}"/sbin/grub #330745
+
+	newdoc docs/menu.lst grub.conf.sample
+	dodoc "${FILESDIR}"/grub.conf.gentoo
+
+	[[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] && \
+		mv "${D}"/usr/share/doc/{${PF},grub-static-${PF/grub-}}
+
+	insinto /usr/share/grub
+	doins "${DISTDIR}"/splash.xpm.gz
+}
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}
+
+	mkdir -p "${dir}"
+	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
+	dir="${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 "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		echo
+	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
+		ewarn "This means you must use either grub-install or perform"
+		ewarn "root/setup manually."
+		ewarn
+		ewarn "For more help, see the handbook:"
+		ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
+		echo
+	fi
+
+	einfo "Copying files from /lib/grub and /usr/share/grub to ${dir}"
+	for x in \
+		"${ROOT}"/lib*/grub/*/* \
+		"${ROOT}"/usr/share/grub/* ; do
+		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
+	done
+
+	if [[ ! -e ${dir}/grub.conf ]] ; then
+		s="${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 run a
+	# specific set of Grub setup commands rather than the default ones.
+	grub_config=${dir}/grub.conf.install
+	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
+	if [[ -e ${grub_config} ]] ; then
+		egrep \
+			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+			"${grub_config}" | \
+		/sbin/grub --batch \
+			--device-map="${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="${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 mixed into
+		# the other output.
+		einfo ""
+	fi
+	elog "To interactively install grub files to another device such as a USB"
+	elog "stick, just run the following and specify the directory as prompted:"
+	elog "   emerge --config =${PF}"
+	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/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="${GRUB_ALT_INSTALLDIR}"
+	fi
+	setup_boot_dir "${dir}"
+}

diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 7911770..93f7a8f 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -9,18 +9,4 @@
     <email>tommy@gentoo.org</email>
     <name>Thomas Sachau</name>
   </maintainer>
-<use>
-	<flag name='device-mapper'>
-		Enable support for <pkg>sys-fs/device-mapper</pkg>
-	</flag>
-	<flag name='efiemu'>
-		Build and install the efiemu runtimes
-	</flag>
-	<flag name='mount'>
-		Build and install the grub-mount utility
-	</flag>
-	<flag name='libzfs'>
-		Enable support for <pkg>sys-fs/zfs</pkg>
-	</flag>
-</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-06-16 23:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-16 23:49 [gentoo-commits] proj/multilib-portage:master commit in: sys-boot/grub/ Thomas Sachau
  -- strict thread matches above, loose matches on Subject: below --
2012-03-12 22:37 Nathan Phillip Brink

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox