From 721254b86a09bdedd5eefd0de7899c90ea2ead1a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jan 2018 20:42:22 +0000 Subject: gentoo resync : 01.01.2018 --- sys-boot/Manifest.gz | Bin 7395 -> 7401 bytes sys-boot/grub/Manifest | 5 +- sys-boot/grub/grub-0.97-r16.ebuild | 10 +- sys-boot/grub/grub-0.97-r17.ebuild | 300 ------------------------------------- sys-boot/grub/grub-0.97-r18.ebuild | 10 +- 5 files changed, 4 insertions(+), 321 deletions(-) delete mode 100644 sys-boot/grub/grub-0.97-r17.ebuild (limited to 'sys-boot') diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz index a2086b1de8d0..78fb77c6ea73 100644 Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 38bf57880a60..509027e71748 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -11,9 +11,8 @@ DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b4068 DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41adce46fe9bc4926bbefcac5cd01efc41794049b1c905502b18e69b5f0546bcf3cea79bf351e1817574 SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 -EBUILD grub-0.97-r16.ebuild 9699 BLAKE2B 3e2dc7f68a680383a94251b626ac955b97392ccc1ed5edb5f7324937d9b0cf4753994d4d00af8277e228fe2ab52d6c9aa97f02517acefa7ba89825a08879b556 SHA512 0edce20bd616493dc8e83276fd89fc2b762794cc25572c4ad3cc055c1c8c209ca2d6dc6a1a90a54deb17a245f7218468f7054099d20688ebd0debf227624c057 -EBUILD grub-0.97-r17.ebuild 9504 BLAKE2B b3ddc158d4561143cf2e758c481d7ea46e1904ee7cdf7827f2fc36417f7d74b335b24e7620a738581649e3d581566148c3eb70453d79315664af3edd8213f09c SHA512 baca5041b77495ba37d0d43e0f8bddc52a61dd176185c1e88d7f2592795a6efb3183661d2433d9fafdf50ee5cf4e5537fbb1a22431f4fe1195f61a3773bfb133 -EBUILD grub-0.97-r18.ebuild 10246 BLAKE2B 411ee7fda69010f2c796fcf53366d80416bc4ed8341d45b94094f762afd44745f4ac4eab9953010ef4a411c3717aff7afbafaa119361d5c5d093b2bd3e7bcd55 SHA512 45eedf241a3a4e050f4304ef1d82a3aa08b19b78a49d786ccf35c7720cf263fa386bf4fdf9cd040a4730fbfef0c2a8d1bff1a0fa2dfe87bef52b53f0bd985216 +EBUILD grub-0.97-r16.ebuild 9596 BLAKE2B ff6e369d331c18300a8a5b73232d5381ffecac3364ce2c789e3db2f510f1d0ebc929994eaafa41cec4193676c39022f4bda868afd95d5ee15dfa61fadba29bf8 SHA512 26aa6178cc463e79cf3416773517e35606aca9d8721da2f6aee0d5b7db223b32e4ca812188a488734784a5725646daceff24b3ae9d8e14452becad1ce25ebff1 +EBUILD grub-0.97-r18.ebuild 10143 BLAKE2B ee8f387c364af84203d991914a2f3f342ac63ab28777f18e72269df5897aa091f3237549f23128502cd5eb3309ff0ff38682da8ac2fdfba31cbf034525a2a407 SHA512 7f4abe2696425e41b27ef03cf8b9598209f71487b387edd15466c7ebeedd4636f9f456d5bc588895690b2cacf2e304c27d407331e1c4c155533fc652f6b93072 EBUILD grub-2.02.ebuild 7597 BLAKE2B 31631da1a5c9c871ecfff60f9508bc81b557ed25226b70f31b0157611db6ea237e269f44fc0789215c19c32f4633cb9e0ca1293c3af2dc86b6e6b4ffb78538ed SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba EBUILD grub-9999.ebuild 7599 BLAKE2B 1a4dea600c7763b2be97adb02a9ccb3004f1dd565e6bb98f1fd14e063931c98698332bf0a58c1d709f645afff834cadfc021032044229b1313af658bc1551b60 SHA512 cfb7ffc4a2d94d0ceaaf6fa63d6c587b8c35488c3f00cc667073926a00c90044c58e94f69e53d765b13ea792f7e79e49b59529ad2788460367259ad2524bd410 MISC metadata.xml 1488 BLAKE2B 3aa41f3c6c45258892bcf2800bfe09b506d11aa69a3071977e58736e496b72b71df579cfcaf1d14a3b81db695aca0bf7dbcc7a18faf1c62dd05f033bdafb00c8 SHA512 71f3e48b73c3d20f213ae928b16499131417562d98b83f2d82a5fb026c8cc06ecddf9db32565d9e1602d4258f7a2cc1796eb523c4cb98fb6b7753328a29e93ba diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild index 06d9aa23b124..22793c03ab03 100644 --- a/sys-boot/grub/grub-0.97-r16.ebuild +++ b/sys-boot/grub/grub-0.97-r16.ebuild @@ -17,7 +17,7 @@ EAPI="5" -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils PATCHVER="1.14" # Should match the revision ideally DESCRIPTION="GNU GRUB Legacy boot loader" @@ -121,12 +121,8 @@ src_configure() { 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} \ @@ -141,8 +137,6 @@ src_configure() { --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 @@ -156,8 +150,6 @@ src_configure() { # 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() { diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild deleted file mode 100644 index b34191f7346d..000000000000 --- a/sys-boot/grub/grub-0.97-r17.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# 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 - 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="5" - -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="https://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:0[static-libs(+),abi_x86_32(-)] )" -RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )" -DEPEND="${RDEPEND} - virtual/pkgconfig - static? ( ${LIB_DEPEND} )" -RDEPEND+=" !sys-boot/grub:2[-multislot]" - -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 - - # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie - if (( $(gcc-major-version) > 5 )); then - sed -i 's/-nopie/-no-pie/' \ - "${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \ - || die - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch - # bug 564890, 566638 - epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch - epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch - - epatch_user - - 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 wiki:" - ewarn "https://wiki.gentoo.org/wiki/GRUB" - 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/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild index eb8206061434..9d5aeede6898 100644 --- a/sys-boot/grub/grub-0.97-r18.ebuild +++ b/sys-boot/grub/grub-0.97-r18.ebuild @@ -17,7 +17,7 @@ EAPI="6" -inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing +inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils PATCHVER="1.15" # Should match the revision ideally DESCRIPTION="GNU GRUB Legacy boot loader" @@ -121,12 +121,8 @@ src_configure() { 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} \ @@ -141,8 +137,6 @@ src_configure() { --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 @@ -156,8 +150,6 @@ src_configure() { # 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() { -- cgit v1.2.3