diff options
| author |   Zorry <zorry.at.ume.nu> | 2009-08-14 15:36:12 +0200 |
|---|---|---|
| committer | Zorry <zorry.at.ume.nu> | 2009-08-14 15:36:12 +0200 |
| commit | f5e267ad97fc8c89c6a28f1ecafc9f9e5a744abd (patch) | |
| tree | 387d06c7812a7f6c702c2cbe05961b6503e14628 | |
| parent | sys-libs/glibc/glibc-2.10.1 updated bug #270274 (diff) | |
| download | hardened-dev-f5e267ad97fc8c89c6a28f1ecafc9f9e5a744abd.tar.gz hardened-dev-f5e267ad97fc8c89c6a28f1ecafc9f9e5a744abd.tar.bz2 hardened-dev-f5e267ad97fc8c89c6a28f1ecafc9f9e5a744abd.zip | |
sys-boot/grub/grub-0.97-r10 updated bug #279536
| -rw-r--r-- | sys-boot/grub/Manifest | 2 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r10.ebuild | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 21050bed..8760baca 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -3,4 +3,4 @@ AUX grub.conf.gentoo 659 RMD160 9ab841d6fdd03be3f99f109ed3dfe0a5027e66d2 SHA1 26 DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd44b429eaa SHA1 1d9da2df8bccef9821ebbbc2f5c5353dbd90bf4d SHA256 6b8445c9260803f059031cbe7475a45fee6499fc2dbd911288af6169455c4028 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 8992 RMD160 11f5a6cf78e39f345febaf46f4b77863bcf8e867 SHA1 f28a4d57dcc5affc538677ff6d7941d30d19c47b SHA256 5a1aff3a3da097cecbccea0d787ffd6c261a6630027ba767ebe5981b24325164 +EBUILD grub-0.97-r10.ebuild 9101 RMD160 f7616847570e143952587dc1aa1dd2737c60041a SHA1 24110a0dbff3b596fcb8ef12afb7d6ad840138cd SHA256 46bf359b9805b1b4b06b46f3d4bef0903df61d41e296660c7ce0ea8d178c146a diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild index 7ec63881..44b56fd7 100644 --- a/sys-boot/grub/grub-0.97-r10.ebuild +++ b/sys-boot/grub/grub-0.97-r10.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild,v 1.1 2009/01/02 01:51:05 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.56 2009/08/14 18:46:05 zorry 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. -inherit mount-boot eutils flag-o-matic toolchain-funcs autotools +inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info PATCHVER="1.9" # Should match the revision ideally DESCRIPTION="GNU GRUB Legacy boot loader" @@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 x86 ~x86-fbsd" IUSE="custom-cflags ncurses netboot static" DEPEND="ncurses? ( @@ -28,6 +28,13 @@ DEPEND="ncurses? ( )" PROVIDE="virtual/bootloader" +pkg_setup() { + local arch="$(tc-arch)" + case ${arch} in + amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;; + esac +} + src_unpack() { unpack ${A} cd "${S}" @@ -56,7 +63,7 @@ src_unpack() { "${S}"/grub/asmstub.c \ || die "Failed to hack memory size" - # Ticket 20 http://hardened.gentooexperimental.org/secure/report/1 + # Bug #279536 sys-boot/grub-0.97 segfaults with >=sys-devel/gcc-4.1 SSP epatch "${FILESDIR}"/grub-0.97-gcc4-hardened.patch if [[ -n ${PATCHVER} ]] ; then @@ -172,7 +179,7 @@ setup_boot_dir() { local boot_dir=$1 local dir=${boot_dir} - [[ ! -e ${dir} ]] && die "${dir} does not exist!" + mkdir -p "${dir}" [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" dir="${dir}/grub" if [[ ! -e ${dir} ]] ; then |