From: "Tomas Chvatal" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
Date: Fri, 12 Aug 2011 10:02:41 +0000 (UTC) [thread overview]
Message-ID: <de9cd56dbca81cbfd79ae1ac55bde244aeb12e9e.scarabeus@gentoo> (raw)
commit: de9cd56dbca81cbfd79ae1ac55bde244aeb12e9e
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 10:01:18 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 10:02:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=de9cd56d
[sys-boot/grub] disable nls as it causes issues on some setups. better safe than sorry.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 5 +++--
sys-boot/grub/grub-9999.ebuild | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d0200ce..09152de 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1127 RMD160 a884e842cb203687cac4cac6551b0feed58d3b7a SHA1 5878147845b5d4b4aac34ce046ead60b93c3170c SHA256 32664f2e0bdd05cf9579f8e098aa0add76ef7bf7b37eb103c6d0f625204f44d3
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 7674 RMD160 873da5347010865f06807c51697384d54cf84608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b
-EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba2919096492a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f6896b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf
+EBUILD grub-1.99.ebuild 7719 RMD160 8069d5baaa5ca2e9c70eff53035ec422ab15bb9d SHA1 8e7b392335499be4d93221ae7ec6691acd4e6289 SHA256 f536f6564d8297caf6f4b7f51c89bd9cda156b9d812c73d10c5b1ef6910d0efd
+EBUILD grub-9999.ebuild 7718 RMD160 717708af5bf4ccdd1430275d0a102f7c5910b348 SHA1 8c4a2d7a35fe1ce2ce5e9d0c52515f07237078b5 SHA256 81ee11890c0e274b2beed7f89c09e6742df0ee3038393be644b11171e48e1dc8
MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index f3e2eb8..343ae88 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+IUSE="custom-cflags debug device-mapper static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
@@ -148,8 +148,10 @@ grub_src_configure() {
fi
fi
+ # nls: cause various issues on boot, rather disable
ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
+ --disable-nls \
--disable-werror \
--sbindir=/sbin \
--bindir=/bin \
@@ -157,7 +159,6 @@ grub_src_configure() {
--disable-efiemu \
$(use_enable device-mapper) \
$(use_enable truetype grub-mkfont) \
- $(use_enable nls) \
$(use_enable debug mm-debug) \
$(use sdl && use_enable debug grub-emu-sdl) \
$(use_enable debug grub-emu-usb) \
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index bd8ad8c..a56abc0 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+IUSE="custom-cflags debug device-mapper static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
# everywhere:
@@ -147,9 +147,10 @@ grub_src_configure() {
platform=" --with-platform=${platform}"
fi
fi
-
+ # nls: cause various issues on boot, rather disable
ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
+ --disable-nls \
--disable-werror \
--sbindir=/sbin \
--bindir=/bin \
@@ -157,7 +158,6 @@ grub_src_configure() {
--disable-efiemu \
$(use_enable device-mapper) \
$(use_enable truetype grub-mkfont) \
- $(use_enable nls) \
$(use_enable debug mm-debug) \
$(use sdl && use_enable debug grub-emu-sdl) \
$(use_enable debug grub-emu-usb) \
next reply other threads:[~2011-08-12 10:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-12 10:02 Tomas Chvatal [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-26 18:18 [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/ Tomas Chvatal
2011-08-12 19:48 Tomas Chvatal
2011-08-12 19:43 Tomas Chvatal
2011-08-12 14:38 Tomas Chvatal
2011-08-12 13:28 Tomas Chvatal
2011-08-12 12:19 Tomas Chvatal
2011-08-08 20:08 Tomas Chvatal
2011-06-11 15:15 Tomas Chvatal
2011-06-11 11:18 Tomas Chvatal
2011-06-08 20:36 Tomas Chvatal
2011-06-05 21:22 Tomas Chvatal
2011-06-05 19:31 Tomas Chvatal
2011-06-05 19:31 Tomas Chvatal
2011-06-05 17:11 Tomas Chvatal
2011-06-05 10:48 Tomas Chvatal
2011-05-30 13:21 Tomas Chvatal
2011-05-26 17:10 Tomas Chvatal
2011-05-25 20:07 Tomas Chvatal
2011-05-19 7:13 Tomas Chvatal
2011-05-15 13:09 Tomas Chvatal
2011-05-15 12:47 Tomas Chvatal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=de9cd56dbca81cbfd79ae1ac55bde244aeb12e9e.scarabeus@gentoo \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox