* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-05 21:22 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-05 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 023bca15223b6199f0f8908fbaba5a5817999d5a
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 21:21:28 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 21:21:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=023bca15
[sys-boot/grub] cleanup loop logic a bit.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 4 +---
sys-boot/grub/grub-9999.ebuild | 4 +---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 3be57a7..6b5daed 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 6513 RMD160 146db2a4fcceca972725e8efe04f1d470b3ff625 SHA1 487c6b5f0e8dec082775a2bc0635048fd9febd8a SHA256 1baf78a7aef0adbd1baa7b8b96521790cc9c826766b384f3507172882862d769
-EBUILD grub-9999.ebuild 6513 RMD160 146db2a4fcceca972725e8efe04f1d470b3ff625 SHA1 487c6b5f0e8dec082775a2bc0635048fd9febd8a SHA256 1baf78a7aef0adbd1baa7b8b96521790cc9c826766b384f3507172882862d769
+EBUILD grub-1.99.ebuild 6363 RMD160 7b1305a028d675725f6ca5f34da29f350903945e SHA1 2cd4b15b4ed1522cd57d9c9650a464be5089e61b SHA256 688c45d0726f23211023496cb503865b5f37fc4af40665a2faeaee4bcb1bdc04
+EBUILD grub-9999.ebuild 6363 RMD160 7b1305a028d675725f6ca5f34da29f350903945e SHA1 2cd4b15b4ed1522cd57d9c9650a464be5089e61b SHA256 688c45d0726f23211023496cb503865b5f37fc4af40665a2faeaee4bcb1bdc04
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 cfc81f6..9b09547 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -159,6 +159,7 @@ src_prepare() {
for i in ${GRUB_PLATFORMS}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
@@ -168,7 +169,6 @@ src_configure() {
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
@@ -177,7 +177,6 @@ src_configure() {
src_compile() {
local i
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
@@ -186,7 +185,6 @@ src_compile() {
src_install() {
local i
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index cfc81f6..9b09547 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -159,6 +159,7 @@ src_prepare() {
for i in ${GRUB_PLATFORMS}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
@@ -168,7 +169,6 @@ src_configure() {
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
@@ -177,7 +177,6 @@ src_configure() {
src_compile() {
local i
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
@@ -186,7 +185,6 @@ src_compile() {
src_install() {
local i
- [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-26 18:18 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-26 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 8a1f7c06de27256986f4088702b2f1040087bf5d
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 26 18:18:25 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 18:18:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=8a1f7c06
[sys-boot/grub] Link our own guide.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 6 ++----
sys-boot/grub/grub-9999.ebuild | 6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e974919..d044211 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 6907 RMD160 c4383a3330b8059052b76e42cbbe690558c79040 SHA1 dc2e13b5ea2652535c2ee84942019a7755212a86 SHA256 c7e681b575a05e29f9c7d6631ea71f1715bb9653876d1b77cd4c2ff784e68f8b
-EBUILD grub-9999.ebuild 6907 RMD160 e9cfb1feacc6d5041182e0082f3041d56e62ff5f SHA1 3f3c904ea7ac55e4379549aac52980ec4f60b887 SHA256 bc53038de78ccecabb4651817973d2fc5d40730d9b9450bf3bdb11329b741081
+EBUILD grub-1.99.ebuild 6825 RMD160 b193fb9a62d7771eab5889536038087774043453 SHA1 ba1b1d8840f54cc24c4e3dd1c3cabcbc00a43cbb SHA256 9f3ef5420e59be7fb315fa1564944e64d0b604bd80c01c6040570eab8d16eef5
+EBUILD grub-9999.ebuild 6825 RMD160 483e67ef34a0e461364f8a7f2c9f6d08a4fa940c SHA1 21969690c51c7b1da3e0d35899d993c701e44f74 SHA256 c5e0fb767a1d968eb0974e7bfaa26c9763baa8122ed70c7d7f31af8cbef0e9dc
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 a5de638..fcd5df1 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -220,10 +220,8 @@ setup_boot_dir() {
if [[ ! -e ${dir}/grub.cfg ]]; then
# display the link to guide if user didn't set up anything yet.
- elog "For informations how to configure grub-2 please reffer to guide:"
- # FIXME: we don't have any guide yet!
- # Lets just use archlinux wiki until we have some.
- elog " https://wiki.archlinux.org/index.php/GRUB2"
+ elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
fi
if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4a9d5ed..c841ea8 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -220,10 +220,8 @@ setup_boot_dir() {
if [[ ! -e ${dir}/grub.cfg ]]; then
# display the link to guide if user didn't set up anything yet.
- elog "For informations how to configure grub-2 please reffer to guide:"
- # FIXME: we don't have any guide yet!
- # Lets just use archlinux wiki until we have some.
- elog " https://wiki.archlinux.org/index.php/GRUB2"
+ elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
fi
if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 19:48 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 14d628112e70c44a78719c1dd53115963345bd50
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 19:48:05 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 19:48:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=14d62811
[sys-boot/grub] Update the strip mask. now the thing should work fine
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c7c8065..e974919 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 6906 RMD160 1f9632b5c2d46a61aaefdc60a768841229f965e7 SHA1 9db3588a488a43ecec9acd788bb9580209bfe374 SHA256 88713c49f4897308edae474da5217aba759fbc4114516229ea512639eeccd6a0
-EBUILD grub-9999.ebuild 6906 RMD160 d0fb2433e03d28a270223dbbe1c5e54f050bc19a SHA1 8877fcf161c099f22f6b5b7888fab94a8a1e7c74 SHA256 dc4dd171389556267f925bacb4f24a0031e20ad1e10aa305d392881645f65d3b
+EBUILD grub-1.99.ebuild 6907 RMD160 c4383a3330b8059052b76e42cbbe690558c79040 SHA1 dc2e13b5ea2652535c2ee84942019a7755212a86 SHA256 c7e681b575a05e29f9c7d6631ea71f1715bb9653876d1b77cd4c2ff784e68f8b
+EBUILD grub-9999.ebuild 6907 RMD160 e9cfb1feacc6d5041182e0082f3041d56e62ff5f SHA1 3f3c904ea7ac55e4379549aac52980ec4f60b887 SHA256 bc53038de78ccecabb4651817973d2fc5d40730d9b9450bf3bdb11329b741081
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 44eec65..a5de638 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -63,7 +63,7 @@ else
DEPEND+=" app-arch/xz-utils"
fi
-export STRIP_MASK="*/grub/*/*.{mod,img}"
+export STRIP_MASK="*/grub*/*/*.{mod,img}"
QA_EXECSTACK="
lib64/grub2/*/setjmp.mod
lib64/grub2/*/kernel.img
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2430b13..4a9d5ed 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -63,7 +63,7 @@ else
DEPEND+=" app-arch/xz-utils"
fi
-export STRIP_MASK="*/grub/*/*.{mod,img}"
+export STRIP_MASK="*/grub*/*/*.{mod,img}"
QA_EXECSTACK="
lib64/grub2/*/setjmp.mod
lib64/grub2/*/kernel.img
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 19:43 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 525932c915541c8549464313dd289dd6ed417b6f
Author: Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Fri Aug 12 17:01:07 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 19:43:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=525932c9
sync with g-x86
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 8 ++++++--
sys-boot/grub/grub-9999.ebuild | 8 ++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a276543..c7c8065 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 6732 RMD160 35e38015bd2be6ddc0f8c8b01d77099b64a1761c SHA1 1e10ba0919b936c5011a477e3be3e34f9772b85a SHA256 c137e3963c321675e9520739a10c56a077e937a50901e3900b975a01fbcca86d
-EBUILD grub-9999.ebuild 6732 RMD160 41b36e2a51b03a99b9a30979228acd0e84f53fe2 SHA1 23d8078aaea0ff720368a4882f461b9f34c3d600 SHA256 15a280c61740f03ad6a6c3f8607af3fa8216b0bb7a5790336a1176b42cf6beb5
+EBUILD grub-1.99.ebuild 6906 RMD160 1f9632b5c2d46a61aaefdc60a768841229f965e7 SHA1 9db3588a488a43ecec9acd788bb9580209bfe374 SHA256 88713c49f4897308edae474da5217aba759fbc4114516229ea512639eeccd6a0
+EBUILD grub-9999.ebuild 6906 RMD160 d0fb2433e03d28a270223dbbe1c5e54f050bc19a SHA1 8877fcf161c099f22f6b5b7888fab94a8a1e7c74 SHA256 dc4dd171389556267f925bacb4f24a0031e20ad1e10aa305d392881645f65d3b
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 7e0892d..44eec65 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -158,11 +158,15 @@ src_prepare() {
# autogen.sh does more than just run autotools
if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/ d' autogen.sh || die
+ sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
(. ./autogen.sh) || die
- eautoreconf
fi
+ # install into the right dir for eselect #372735
+ sed -i \
+ -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+ util/bash-completion.d/Makefile.in || die
+
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index fcf22f0..2430b13 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -158,11 +158,15 @@ src_prepare() {
# autogen.sh does more than just run autotools
if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/ d' autogen.sh || die
+ sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
(. ./autogen.sh) || die
- eautoreconf
fi
+ # install into the right dir for eselect #372735
+ sed -i \
+ -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+ util/bash-completion.d/Makefile.in || die
+
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 14:38 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 14:38 UTC (permalink / raw
To: gentoo-commits
commit: 8f4a1013f22a683ec398e19a20127b6726540248
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 14:38:33 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 14:38:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=8f4a1013
[sys-boot/grub] update qa masks.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 6 +++---
sys-boot/grub/grub-9999.ebuild | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 612ad8c..a276543 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 6731 RMD160 7fab87fdc6fad34d3d8769233a50480023fe71ec SHA1 b038308415c7badd3156234f322a5d037cbf72ce SHA256 41dfecbd2f27f1b551a55217691262591ed071cd3bbf06960fdf0a6c0a0113e6
-EBUILD grub-9999.ebuild 6731 RMD160 bc7a597c5f439898b6a502471117f3d3b3baa53b SHA1 299a502248b8115e154932f96fa1bcf6bf95e5c9 SHA256 883b3446c17c9210ec6a84a8c0982d1fd92b8c173cedc2b3bb77b4a9ae1be55b
+EBUILD grub-1.99.ebuild 6732 RMD160 35e38015bd2be6ddc0f8c8b01d77099b64a1761c SHA1 1e10ba0919b936c5011a477e3be3e34f9772b85a SHA256 c137e3963c321675e9520739a10c56a077e937a50901e3900b975a01fbcca86d
+EBUILD grub-9999.ebuild 6732 RMD160 41b36e2a51b03a99b9a30979228acd0e84f53fe2 SHA1 23d8078aaea0ff720368a4882f461b9f34c3d600 SHA256 15a280c61740f03ad6a6c3f8607af3fa8216b0bb7a5790336a1176b42cf6beb5
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 d963f96..7e0892d 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -63,10 +63,10 @@ else
DEPEND+=" app-arch/xz-utils"
fi
-export STRIP_MASK="*/grub/*/*.{mod,img}a"
+export STRIP_MASK="*/grub/*/*.{mod,img}"
QA_EXECSTACK="
- lib64/grub/*/setjmp.mod
- lib64/grub/*/kernel.img
+ lib64/grub2/*/setjmp.mod
+ lib64/grub2/*/kernel.img
sbin/grub2-probe
sbin/grub2-setup
sbin/grub2-mkdevicemap
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a16f2a7..fcf22f0 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -63,10 +63,10 @@ else
DEPEND+=" app-arch/xz-utils"
fi
-export STRIP_MASK="*/grub/*/*.{mod,img}a"
+export STRIP_MASK="*/grub/*/*.{mod,img}"
QA_EXECSTACK="
- lib64/grub/*/setjmp.mod
- lib64/grub/*/kernel.img
+ lib64/grub2/*/setjmp.mod
+ lib64/grub2/*/kernel.img
sbin/grub2-probe
sbin/grub2-setup
sbin/grub2-mkdevicemap
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 13:28 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 13:28 UTC (permalink / raw
To: gentoo-commits
commit: d975dab227e3ba52acdab9924c8c802c731a3317
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 13:28:47 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 13:28:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=d975dab2
Punt useless code and die with better msg.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 26 ++------------------------
sys-boot/grub/grub-9999.ebuild | 26 ++------------------------
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 7f610ce..612ad8c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX grub.default 1130 RMD160 6df056d7bcbaf75783921c5c45bcf3544d284f58 SHA1 c62cb61c4d96ca9780ea559d1d38fce91197c701 SHA256 8e2cc8c02135a13d4401971ce9955039cc0dc7ceb045e3eff8ba673fceef6bb9
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 7267 RMD160 57fed8e4ebc094fa4b8b8604643523d8fc60425b SHA1 0aa4decbf894e4dd187c4684e4bccdbdd1c18cda SHA256 45c0adeb9b249716e0aed753c96768113759701da3d7ebd8b25758538ffa0dd9
-EBUILD grub-9999.ebuild 7267 RMD160 8e772a74a69033f00abb4a6827105117a2aeb248 SHA1 5bedf054f5ec99212020caa5c3a8e272fd202061 SHA256 861b2c580849eb8aa5153b002dc7106ff92c2cdc204d1a31e92c5324ca94eb7a
+EBUILD grub-1.99.ebuild 6731 RMD160 7fab87fdc6fad34d3d8769233a50480023fe71ec SHA1 b038308415c7badd3156234f322a5d037cbf72ce SHA256 41dfecbd2f27f1b551a55217691262591ed071cd3bbf06960fdf0a6c0a0113e6
+EBUILD grub-9999.ebuild 6731 RMD160 bc7a597c5f439898b6a502471117f3d3b3baa53b SHA1 299a502248b8115e154932f96fa1bcf6bf95e5c9 SHA256 883b3446c17c9210ec6a84a8c0982d1fd92b8c173cedc2b3bb77b4a9ae1be55b
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 b682bf6..d963f96 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -84,8 +84,7 @@ QA_EXECSTACK="
grub_run_phase() {
local phase=$1
local platform=$2
- [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined"
- [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+ [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
[[ -d "${WORKDIR}/build-${platform}" ]] || \
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
@@ -99,32 +98,11 @@ grub_run_phase() {
popd > /dev/null || die
}
-grub_rename_files() {
- # specifies if we do sed work too
- local deep=$1
- [[ ${deep} == deep ]] && shift || deep=""
- local path=$@
-
- [[ -z ${path} ]] && die "${FUNCNAME}: Path is undefined"
-
- pushd "${path}" > /dev/null
- for i in grub*; do
- echo ">>> Slotting \"${path}/${i}\" to \"${path}/${i/grub/grub2}\""
- if [[ -n $deep ]]; then
- sed -i \
- -e 's:\([[:space:]]\+\)grub-:\1grub2-:g' \
- ${i} || die
- fi
- mv ${i} ${i/grub/grub2} || die
- done
- popd > /dev/null
-}
-
grub_src_configure() {
local platform=$1
local target
- [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+ [[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
# if we have no platform then --with-platform=guessed does not work
[[ ${platform} == "guessed" ]] && platform=""
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 00eb143..a16f2a7 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -84,8 +84,7 @@ QA_EXECSTACK="
grub_run_phase() {
local phase=$1
local platform=$2
- [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined"
- [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+ [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
[[ -d "${WORKDIR}/build-${platform}" ]] || \
{ mkdir "${WORKDIR}/build-${platform}" || die ; }
@@ -99,32 +98,11 @@ grub_run_phase() {
popd > /dev/null || die
}
-grub_rename_files() {
- # specifies if we do sed work too
- local deep=$1
- [[ ${deep} == deep ]] && shift || deep=""
- local path=$@
-
- [[ -z ${path} ]] && die "${FUNCNAME}: Path is undefined"
-
- pushd "${path}" > /dev/null
- for i in grub*; do
- echo ">>> Slotting \"${path}/${i}\" to \"${path}/${i/grub/grub2}\""
- if [[ -n $deep ]]; then
- sed -i \
- -e 's:\([[:space:]]\+\)grub-:\1grub2-:g' \
- ${i} || die
- fi
- mv ${i} ${i/grub/grub2} || die
- done
- popd > /dev/null
-}
-
grub_src_configure() {
local platform=$1
local target
- [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+ [[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
# if we have no platform then --with-platform=guessed does not work
[[ ${platform} == "guessed" ]] && platform=""
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 12:19 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 667a47d2541d4d6cbe18d40051c2011dbf239b3c
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 12:19:17 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 12:19:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=667a47d2
Revert "[sys-boot/grub] disable nls as it causes issues on some setups. better safe than sorry."
This reverts commit de9cd56dbca81cbfd79ae1ac55bde244aeb12e9e.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 5 ++---
sys-boot/grub/grub-9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 09152de..d0200ce 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 7719 RMD160 8069d5baaa5ca2e9c70eff53035ec422ab15bb9d SHA1 8e7b392335499be4d93221ae7ec6691acd4e6289 SHA256 f536f6564d8297caf6f4b7f51c89bd9cda156b9d812c73d10c5b1ef6910d0efd
-EBUILD grub-9999.ebuild 7718 RMD160 717708af5bf4ccdd1430275d0a102f7c5910b348 SHA1 8c4a2d7a35fe1ce2ce5e9d0c52515f07237078b5 SHA256 81ee11890c0e274b2beed7f89c09e6742df0ee3038393be644b11171e48e1dc8
+EBUILD grub-1.99.ebuild 7674 RMD160 873da5347010865f06807c51697384d54cf84608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b
+EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba2919096492a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f6896b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf
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 343ae88..f3e2eb8 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 static sdl truetype"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
@@ -148,10 +148,8 @@ 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 \
@@ -159,6 +157,7 @@ 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 a56abc0..bd8ad8c 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 static sdl truetype"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
# everywhere:
@@ -147,10 +147,9 @@ 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 \
@@ -158,6 +157,7 @@ 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) \
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-12 10:02 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-12 10:02 UTC (permalink / raw
To: gentoo-commits
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) \
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-08-08 20:08 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-08-08 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 46e6313fe4b4ecdb9d6ff9aee7a01497c9da310e
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 20:08:06 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 20:08:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=46e6313f
[sys-boot/grub] incorporate suggestions from pva
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 4 ++--
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 70cc111..d0200ce 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 7673 RMD160 896bfea26ed04644e1998ad97e0bd63080c005c6 SHA1 4977fd57f41655022130cfb257c46d6192b6306b SHA256 abbe58c09a20c05d702a186b7172a5924804eb44d602f474867966799276aee8
-EBUILD grub-9999.ebuild 7674 RMD160 906fc75149f13f3fc8b6f18f05e9f54ae0701a69 SHA1 101341a41a674a06942b518f7c88ba7db5c025ca SHA256 7603e93cf94b5dd73dc3a902e4556ee75dd594324cb92be4cf96695827a18a1d
+EBUILD grub-1.99.ebuild 7674 RMD160 873da5347010865f06807c51697384d54cf84608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b
+EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba2919096492a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f6896b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf
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 98835e3..f3e2eb8 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -30,7 +30,7 @@ GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips
# everywhere:
# emu
# mips only:
-# qemu-mips, yeelong
+# qemu-mips, yeeloong
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
@@ -239,7 +239,7 @@ src_install() {
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
insinto /etc/default
newins "${FILESDIR}"/grub.default grub
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+ cat <<EOF >> "${ED}"/lib*/grub/grub-mkconfig_lib
GRUB_DISTRIBUTOR="Gentoo"
EOF
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index f0bc2bf..bd8ad8c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -239,7 +239,7 @@ src_install() {
dodoc AUTHORS ChangeLog NEWS README THANKS TODO
insinto /etc/default
newins "${FILESDIR}"/grub.default grub
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+ cat <<EOF >> "${ED}"/lib*/grub/grub-mkconfig_lib
GRUB_DISTRIBUTOR="Gentoo"
EOF
}
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-11 15:15 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-11 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 20edc63aa23136627bcd35606d0c5d7a152edee0
Author: Matěj Laitl <matej <AT> laitl <DOT> cz>
AuthorDate: Sat Jun 11 14:50:30 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 15:14:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=20edc63a
different solution for efi hack (rename efi flags back to efi-nn)
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 18 +++++++++---------
sys-boot/grub/grub-9999.ebuild | 18 +++++++++---------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 75508d4..70cc111 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 7683 RMD160 12631ba0d4d494bc0de901cbc11fb76f34938f29 SHA1 c2a90722db4cf03ed6334cc597f3504884814b4c SHA256 3bde7f19ec359b7ce33e50b1d7b4fd07f27e6bdcf576bb54cbb06fe3b6d9319b
-EBUILD grub-9999.ebuild 7684 RMD160 ad7613fb1cccf77d2a81a75840db737cf641a936 SHA1 c46926839bc99ede02aaa21709fcd702c7fefa08 SHA256 bf2c6a9db29e0e3a39ae345bafe0cb43dde0330348e4c8922dc9e10924d46139
+EBUILD grub-1.99.ebuild 7673 RMD160 896bfea26ed04644e1998ad97e0bd63080c005c6 SHA1 4977fd57f41655022130cfb257c46d6192b6306b SHA256 abbe58c09a20c05d702a186b7172a5924804eb44d602f474867966799276aee8
+EBUILD grub-9999.ebuild 7674 RMD160 906fc75149f13f3fc8b6f18f05e9f54ae0701a69 SHA1 101341a41a674a06942b518f7c88ba7db5c025ca SHA256 7603e93cf94b5dd73dc3a902e4556ee75dd594324cb92be4cf96695827a18a1d
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 1f19fd3..98835e3 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -26,7 +26,7 @@ SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
# emu
# mips only:
@@ -34,9 +34,9 @@ GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi_32, pc, qemu
+# coreboot, multiboot, efi-32, pc, qemu
# amd64
-# efi_64
+# efi-64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platforms_${i}"
done
@@ -132,19 +132,19 @@ grub_src_configure() {
# check if we have to specify the target (EFI)
# or just append correct --with-platform
if [[ -n ${platform} ]]; then
- if [[ ${platform/_*} == ${platform} ]]; then
- platform=" --with-platform=${platform}"
- else
+ if [[ ${platform} == efi* ]]; then
# EFI platform hack
- [[ ${platform/*_} == 32 ]] && target=i386
- [[ ${platform/*_} == 64 ]] && target=x86_64
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
- --with-platform=${platform/_*}
+ --with-platform=${platform/-*}
--target=${target}
--program-prefix=
"
+ else
+ platform=" --with-platform=${platform}"
fi
fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ae0b4e..f0bc2bf 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
# everywhere:
# emu
# mips only:
@@ -34,9 +34,9 @@ GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi_32, pc, qemu
+# coreboot, multiboot, efi-32, pc, qemu
# amd64
-# efi_64
+# efi-64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platforms_${i}"
done
@@ -132,19 +132,19 @@ grub_src_configure() {
# check if we have to specify the target (EFI)
# or just append correct --with-platform
if [[ -n ${platform} ]]; then
- if [[ ${platform/_*} == ${platform} ]]; then
- platform=" --with-platform=${platform}"
- else
+ if [[ ${platform} == efi* ]]; then
# EFI platform hack
- [[ ${platform/*_} == 32 ]] && target=i386
- [[ ${platform/*_} == 64 ]] && target=x86_64
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
- --with-platform=${platform/_*}
+ --with-platform=${platform/-*}
--target=${target}
--program-prefix=
"
+ else
+ platform=" --with-platform=${platform}"
fi
fi
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-11 11:18 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-11 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 809b6f1e3e4be9ee8f28530b29111e6d6ff835f4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 11:17:59 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 11:17:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=809b6f1e
[sys-boot/grub] Rename efi cutting so it does not break qemu targets. Add loongson target for live version as yeelong was renamed.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 14 +++++++-------
sys-boot/grub/grub-9999.ebuild | 16 ++++++++--------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9f6ccf6..75508d4 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 7683 RMD160 586653c6286ea53086b11dfe663a5052dd2a78c1 SHA1 77ac581dc7e23d937ff37308faa2d226f8a6fe8c SHA256 022b97492e4b2b1cace0f853e87b8282a2e6cdfe19e0d469836b400c0fd9cea7
-EBUILD grub-9999.ebuild 7683 RMD160 586653c6286ea53086b11dfe663a5052dd2a78c1 SHA1 77ac581dc7e23d937ff37308faa2d226f8a6fe8c SHA256 022b97492e4b2b1cace0f853e87b8282a2e6cdfe19e0d469836b400c0fd9cea7
+EBUILD grub-1.99.ebuild 7683 RMD160 12631ba0d4d494bc0de901cbc11fb76f34938f29 SHA1 c2a90722db4cf03ed6334cc597f3504884814b4c SHA256 3bde7f19ec359b7ce33e50b1d7b4fd07f27e6bdcf576bb54cbb06fe3b6d9319b
+EBUILD grub-9999.ebuild 7684 RMD160 ad7613fb1cccf77d2a81a75840db737cf641a936 SHA1 c46926839bc99ede02aaa21709fcd702c7fefa08 SHA256 bf2c6a9db29e0e3a39ae345bafe0cb43dde0330348e4c8922dc9e10924d46139
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 c229a4c..1f19fd3 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -26,7 +26,7 @@ SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
# emu
# mips only:
@@ -34,9 +34,9 @@ GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi-32, pc, qemu
+# coreboot, multiboot, efi_32, pc, qemu
# amd64
-# efi-64
+# efi_64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platforms_${i}"
done
@@ -132,16 +132,16 @@ grub_src_configure() {
# check if we have to specify the target (EFI)
# or just append correct --with-platform
if [[ -n ${platform} ]]; then
- if [[ ${platform/-*} == ${platform} ]]; then
+ if [[ ${platform/_*} == ${platform} ]]; then
platform=" --with-platform=${platform}"
else
# EFI platform hack
- [[ ${platform/*-} == 32 ]] && target=i386
- [[ ${platform/*-} == 64 ]] && target=x86_64
+ [[ ${platform/*_} == 32 ]] && target=i386
+ [[ ${platform/*_} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
- --with-platform=${platform/-*}
+ --with-platform=${platform/_*}
--target=${target}
--program-prefix=
"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index c229a4c..7ae0b4e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -26,17 +26,17 @@ SLOT="2"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+GRUB_PLATFORMS="coreboot efi_32 efi_64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
# everywhere:
# emu
# mips only:
-# qemu-mips, yeelong
+# qemu-mips, loongson
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi-32, pc, qemu
+# coreboot, multiboot, efi_32, pc, qemu
# amd64
-# efi-64
+# efi_64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platforms_${i}"
done
@@ -132,16 +132,16 @@ grub_src_configure() {
# check if we have to specify the target (EFI)
# or just append correct --with-platform
if [[ -n ${platform} ]]; then
- if [[ ${platform/-*} == ${platform} ]]; then
+ if [[ ${platform/_*} == ${platform} ]]; then
platform=" --with-platform=${platform}"
else
# EFI platform hack
- [[ ${platform/*-} == 32 ]] && target=i386
- [[ ${platform/*-} == 64 ]] && target=x86_64
+ [[ ${platform/*_} == 32 ]] && target=i386
+ [[ ${platform/*_} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
- --with-platform=${platform/-*}
+ --with-platform=${platform/_*}
--target=${target}
--program-prefix=
"
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-08 20:36 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-08 20:36 UTC (permalink / raw
To: gentoo-commits
commit: 498646a4417c250567ef749e76ce80f53d1c636e
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 20:35:15 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 20:35:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=498646a4
[sys-boot/grub] Update the elog informations to be more clear.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 7 +++++--
sys-boot/grub/grub-9999.ebuild | 7 +++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6b5daed..d06afcf 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 6363 RMD160 7b1305a028d675725f6ca5f34da29f350903945e SHA1 2cd4b15b4ed1522cd57d9c9650a464be5089e61b SHA256 688c45d0726f23211023496cb503865b5f37fc4af40665a2faeaee4bcb1bdc04
-EBUILD grub-9999.ebuild 6363 RMD160 7b1305a028d675725f6ca5f34da29f350903945e SHA1 2cd4b15b4ed1522cd57d9c9650a464be5089e61b SHA256 688c45d0726f23211023496cb503865b5f37fc4af40665a2faeaee4bcb1bdc04
+EBUILD grub-1.99.ebuild 6407 RMD160 62d79889abf49dc4b1b78591479c7d7976ce1f7d SHA1 2d9b795313b53f5d0c65786b1526df79ff459ac0 SHA256 d4b4f6ce1b140807bf1850df16855a1e5fd0b187b5dd0d93f2932fca81d9af63
+EBUILD grub-9999.ebuild 6407 RMD160 62d79889abf49dc4b1b78591479c7d7976ce1f7d SHA1 2d9b795313b53f5d0c65786b1526df79ff459ac0 SHA256 d4b4f6ce1b140807bf1850df16855a1e5fd0b187b5dd0d93f2932fca81d9af63
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 9b09547..32ce10f 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -222,7 +222,7 @@ setup_boot_dir() {
einfo "grub-1 configuration file you should migrate to use new style"
einfo "configuration in '${ROOT}/etc/grub.d'."
einfo
- elog "Remember to run grub-install to install your grub!"
+
else
# we need to refresh the grub.cfg everytime just to play it safe
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
@@ -231,7 +231,10 @@ setup_boot_dir() {
fi
elog "Remember to run \"grub-mkconfig -o '${dir}/grub.cfg'\" every time"
- elog "you update the configuration files."
+ elog "you update the configuration files!"
+
+ elog "Remember to run grub-install to install your grub every time"
+ elog "you update this package!"
}
pkg_postinst() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 9b09547..32ce10f 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -222,7 +222,7 @@ setup_boot_dir() {
einfo "grub-1 configuration file you should migrate to use new style"
einfo "configuration in '${ROOT}/etc/grub.d'."
einfo
- elog "Remember to run grub-install to install your grub!"
+
else
# we need to refresh the grub.cfg everytime just to play it safe
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
@@ -231,7 +231,10 @@ setup_boot_dir() {
fi
elog "Remember to run \"grub-mkconfig -o '${dir}/grub.cfg'\" every time"
- elog "you update the configuration files."
+ elog "you update the configuration files!"
+
+ elog "Remember to run grub-install to install your grub every time"
+ elog "you update this package!"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-05 19:31 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-05 19:31 UTC (permalink / raw
To: gentoo-commits
commit: c85237b14793d783cfaed3bbd30e27b60cc29f13
Author: Matěj Laitl <matej <AT> laitl <DOT> cz>
AuthorDate: Sun Jun 5 18:20:54 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 19:30:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=c85237b1
Split efi GRUB_PLATFORM into efi-32 and efi-64 and remove a bit of ugliness
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 22 +++++++++-------------
sys-boot/grub/grub-9999.ebuild | 22 +++++++++-------------
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d3eaf60..4518489 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 6677 RMD160 2380373297e74a52716cd88994cf2a1addfe4c54 SHA1 9ea5f1c5dcfcbe1a8ebddee32c263bc8151cc5a1 SHA256 35442997ce40d6ca00046709480a14f7c4813e5965cf74950a05a36a0ef9b21c
-EBUILD grub-9999.ebuild 6677 RMD160 2380373297e74a52716cd88994cf2a1addfe4c54 SHA1 9ea5f1c5dcfcbe1a8ebddee32c263bc8151cc5a1 SHA256 35442997ce40d6ca00046709480a14f7c4813e5965cf74950a05a36a0ef9b21c
+EBUILD grub-1.99.ebuild 6511 RMD160 51ba31d051b9334403884a992173c92e395775ff SHA1 4fd26fd18cb6c205e934bab5fc9fe5bad77ae556 SHA256 9832c165a787a3acb0058ec068553e17c8b31eaa4a3b877086e12ae56f0db96c
+EBUILD grub-9999.ebuild 6511 RMD160 51ba31d051b9334403884a992173c92e395775ff SHA1 4fd26fd18cb6c205e934bab5fc9fe5bad77ae556 SHA256 9832c165a787a3acb0058ec068553e17c8b31eaa4a3b877086e12ae56f0db96c
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 4127a46..7ed83f9 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
# emu
# mips only:
@@ -34,8 +34,9 @@ GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi, pc, qemu
-# NOTE: efi must be built twice, for i386 and x86_64, rest is just i386.
+# coreboot, multiboot, efi-32, pc, qemu
+# amd64
+# efi-64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platform_${i}"
done
@@ -91,6 +92,7 @@ grub_run_phase() {
grub_src_configure() {
local platform=$1
+ local target
[[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
@@ -104,11 +106,13 @@ grub_src_configure() {
platform=" --with-platform=${platform}"
else
# EFI platform hack
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
--with-platform=${platform/-*}
- --target=${platform/*-}
+ --target=${target}
--program-prefix=
"
fi
@@ -153,15 +157,7 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- # efi needs to be built twice if on amd64
- if [[ ${i} == "efi" ]] && use amd64; then
- archs="x86_64 i386"
- for j in ${archs}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}-${j}"
- done
- else
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
- fi
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4127a46..7ed83f9 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# everywhere:
# emu
# mips only:
@@ -34,8 +34,9 @@ GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
# amd64, x86, ppc, ppc64
# ieee1275
# amd64, x86
-# coreboot, multiboot, efi, pc, qemu
-# NOTE: efi must be built twice, for i386 and x86_64, rest is just i386.
+# coreboot, multiboot, efi-32, pc, qemu
+# amd64
+# efi-64
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platform_${i}"
done
@@ -91,6 +92,7 @@ grub_run_phase() {
grub_src_configure() {
local platform=$1
+ local target
[[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
@@ -104,11 +106,13 @@ grub_src_configure() {
platform=" --with-platform=${platform}"
else
# EFI platform hack
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
# program-prefix is required empty because otherwise it is equal to
# target variable, which we do not want at all
platform="
--with-platform=${platform/-*}
- --target=${platform/*-}
+ --target=${target}
--program-prefix=
"
fi
@@ -153,15 +157,7 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- # efi needs to be built twice if on amd64
- if [[ ${i} == "efi" ]] && use amd64; then
- archs="x86_64 i386"
- for j in ${archs}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}-${j}"
- done
- else
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
- fi
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-05 19:31 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-05 19:31 UTC (permalink / raw
To: gentoo-commits
commit: f3835e099091abb7b5a9b569ffa91c97d0325f3f
Author: Matěj Laitl <matej <AT> laitl <DOT> cz>
AuthorDate: Sun Jun 5 18:31:38 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 19:30:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=f3835e09
Rename GRUB_PLATFORM use-expand to GRUB_PLATFORMS to be consistent with others
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 4 ++--
sys-boot/grub/grub-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4518489..3be57a7 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 6511 RMD160 51ba31d051b9334403884a992173c92e395775ff SHA1 4fd26fd18cb6c205e934bab5fc9fe5bad77ae556 SHA256 9832c165a787a3acb0058ec068553e17c8b31eaa4a3b877086e12ae56f0db96c
-EBUILD grub-9999.ebuild 6511 RMD160 51ba31d051b9334403884a992173c92e395775ff SHA1 4fd26fd18cb6c205e934bab5fc9fe5bad77ae556 SHA256 9832c165a787a3acb0058ec068553e17c8b31eaa4a3b877086e12ae56f0db96c
+EBUILD grub-1.99.ebuild 6513 RMD160 146db2a4fcceca972725e8efe04f1d470b3ff625 SHA1 487c6b5f0e8dec082775a2bc0635048fd9febd8a SHA256 1baf78a7aef0adbd1baa7b8b96521790cc9c826766b384f3507172882862d769
+EBUILD grub-9999.ebuild 6513 RMD160 146db2a4fcceca972725e8efe04f1d470b3ff625 SHA1 487c6b5f0e8dec082775a2bc0635048fd9febd8a SHA256 1baf78a7aef0adbd1baa7b8b96521790cc9c826766b384f3507172882862d769
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 7ed83f9..cfc81f6 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -38,7 +38,7 @@ GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips
# amd64
# efi-64
for i in ${GRUB_PLATFORMS}; do
- IUSE+=" grub_platform_${i}"
+ IUSE+=" grub_platforms_${i}"
done
unset i
@@ -157,7 +157,7 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ed83f9..cfc81f6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -38,7 +38,7 @@ GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips
# amd64
# efi-64
for i in ${GRUB_PLATFORMS}; do
- IUSE+=" grub_platform_${i}"
+ IUSE+=" grub_platforms_${i}"
done
unset i
@@ -157,7 +157,7 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-05 17:11 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-05 17:11 UTC (permalink / raw
To: gentoo-commits
commit: dc8aaff73310582f3162d3594848add699748fc4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 17:11:03 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 17:11:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=dc8aaff7
[sys-boot/grub] Make efi work properly again. Thanks to Matěj Laitl for the debuging and finding the fix.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 5 ++++-
sys-boot/grub/grub-9999.ebuild | 5 ++++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 09fea16..d3eaf60 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 6530 RMD160 b4d2b1242b1bd1cd6b52f40c52212d9428ecfa27 SHA1 b3e9333c0c1384dada73ddd12a858a0af010a116 SHA256 85c7e1959f4753ecc0b5c8fcffe4c11842269cfd98e64858efb03b540ae0dd0d
-EBUILD grub-9999.ebuild 6530 RMD160 b4d2b1242b1bd1cd6b52f40c52212d9428ecfa27 SHA1 b3e9333c0c1384dada73ddd12a858a0af010a116 SHA256 85c7e1959f4753ecc0b5c8fcffe4c11842269cfd98e64858efb03b540ae0dd0d
+EBUILD grub-1.99.ebuild 6677 RMD160 2380373297e74a52716cd88994cf2a1addfe4c54 SHA1 9ea5f1c5dcfcbe1a8ebddee32c263bc8151cc5a1 SHA256 35442997ce40d6ca00046709480a14f7c4813e5965cf74950a05a36a0ef9b21c
+EBUILD grub-9999.ebuild 6677 RMD160 2380373297e74a52716cd88994cf2a1addfe4c54 SHA1 9ea5f1c5dcfcbe1a8ebddee32c263bc8151cc5a1 SHA256 35442997ce40d6ca00046709480a14f7c4813e5965cf74950a05a36a0ef9b21c
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 b12330b..4127a46 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -104,9 +104,12 @@ grub_src_configure() {
platform=" --with-platform=${platform}"
else
# EFI platform hack
+ # program-prefix is required empty because otherwise it is equal to
+ # target variable, which we do not want at all
platform="
--with-platform=${platform/-*}
--target=${platform/*-}
+ --program-prefix=
"
fi
fi
@@ -160,7 +163,7 @@ src_prepare() {
use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
fi
done
- einfo "Will build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+ einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b12330b..4127a46 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -104,9 +104,12 @@ grub_src_configure() {
platform=" --with-platform=${platform}"
else
# EFI platform hack
+ # program-prefix is required empty because otherwise it is equal to
+ # target variable, which we do not want at all
platform="
--with-platform=${platform/-*}
--target=${platform/*-}
+ --program-prefix=
"
fi
fi
@@ -160,7 +163,7 @@ src_prepare() {
use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
fi
done
- einfo "Will build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+ einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-06-05 10:48 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-06-05 10:48 UTC (permalink / raw
To: gentoo-commits
commit: aa02b29a158efc7366ee4704dc8028adb29336b8
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 10:47:53 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 10:47:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=aa02b29a
[sys-boot/grub] Describe what platforms belong where. Try to build both EFI archs. For now fails.
---
sys-boot/grub/Manifest | 4 +-
sys-boot/grub/grub-1.99.ebuild | 45 +++++++++++++++++++++++++++++++++------
sys-boot/grub/grub-9999.ebuild | 45 +++++++++++++++++++++++++++++++++------
3 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 31425b7..09fea16 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 5608 RMD160 7d5fc5f793e025bc271077c02d5942f19a2f2a61 SHA1 7a6087fd1c58d6566b5eab0faecf4b192b1502dd SHA256 b68ca2209a986c683177e8abb2f5c98d25820a919388880e52eeb82b5f339c9e
-EBUILD grub-9999.ebuild 5608 RMD160 7d5fc5f793e025bc271077c02d5942f19a2f2a61 SHA1 7a6087fd1c58d6566b5eab0faecf4b192b1502dd SHA256 b68ca2209a986c683177e8abb2f5c98d25820a919388880e52eeb82b5f339c9e
+EBUILD grub-1.99.ebuild 6530 RMD160 b4d2b1242b1bd1cd6b52f40c52212d9428ecfa27 SHA1 b3e9333c0c1384dada73ddd12a858a0af010a116 SHA256 85c7e1959f4753ecc0b5c8fcffe4c11842269cfd98e64858efb03b540ae0dd0d
+EBUILD grub-9999.ebuild 6530 RMD160 b4d2b1242b1bd1cd6b52f40c52212d9428ecfa27 SHA1 b3e9333c0c1384dada73ddd12a858a0af010a116 SHA256 85c7e1959f4753ecc0b5c8fcffe4c11842269cfd98e64858efb03b540ae0dd0d
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 2d41728..b12330b 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -23,10 +23,19 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="0"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi emu ieee1275 pc qemu yeeloong"
+GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+# everywhere:
+# emu
+# mips only:
+# qemu-mips, yeelong
+# amd64, x86, ppc, ppc64
+# ieee1275
+# amd64, x86
+# coreboot, multiboot, efi, pc, qemu
+# NOTE: efi must be built twice, for i386 and x86_64, rest is just i386.
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platform_${i}"
done
@@ -85,9 +94,22 @@ grub_src_configure() {
[[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
- [[ ${platform} == "guessed" ]] \
- && platform="" \
- || platform="--with-platform=${platform}"
+ # if we have no platform then --with-platform=guessed does not work
+ [[ ${platform} == "guessed" ]] && platform=""
+
+ # check if we have to specify the target (EFI)
+ # or just append correct --with-platform
+ if [[ -n ${platform} ]]; then
+ if [[ ${platform/-*} == ${platform} ]]; then
+ platform=" --with-platform=${platform}"
+ else
+ # EFI platform hack
+ platform="
+ --with-platform=${platform/-*}
+ --target=${platform/*-}
+ "
+ fi
+ fi
ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
@@ -114,7 +136,7 @@ grub_src_install() {
}
src_prepare() {
- local i
+ local i j archs
epatch_user
@@ -128,8 +150,17 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ # efi needs to be built twice if on amd64
+ if [[ ${i} == "efi" ]] && use amd64; then
+ archs="x86_64 i386"
+ for j in ${archs}; do
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}-${j}"
+ done
+ else
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ fi
done
+ einfo "Will build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2d41728..b12330b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -23,10 +23,19 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="0"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi emu ieee1275 pc qemu yeeloong"
+GRUB_PLATFORMS="coreboot efi emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+# everywhere:
+# emu
+# mips only:
+# qemu-mips, yeelong
+# amd64, x86, ppc, ppc64
+# ieee1275
+# amd64, x86
+# coreboot, multiboot, efi, pc, qemu
+# NOTE: efi must be built twice, for i386 and x86_64, rest is just i386.
for i in ${GRUB_PLATFORMS}; do
IUSE+=" grub_platform_${i}"
done
@@ -85,9 +94,22 @@ grub_src_configure() {
[[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
- [[ ${platform} == "guessed" ]] \
- && platform="" \
- || platform="--with-platform=${platform}"
+ # if we have no platform then --with-platform=guessed does not work
+ [[ ${platform} == "guessed" ]] && platform=""
+
+ # check if we have to specify the target (EFI)
+ # or just append correct --with-platform
+ if [[ -n ${platform} ]]; then
+ if [[ ${platform/-*} == ${platform} ]]; then
+ platform=" --with-platform=${platform}"
+ else
+ # EFI platform hack
+ platform="
+ --with-platform=${platform/-*}
+ --target=${platform/*-}
+ "
+ fi
+ fi
ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
@@ -114,7 +136,7 @@ grub_src_install() {
}
src_prepare() {
- local i
+ local i j archs
epatch_user
@@ -128,8 +150,17 @@ src_prepare() {
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
for i in ${GRUB_PLATFORMS}; do
- use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ # efi needs to be built twice if on amd64
+ if [[ ${i} == "efi" ]] && use amd64; then
+ archs="x86_64 i386"
+ for j in ${archs}; do
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}-${j}"
+ done
+ else
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ fi
done
+ einfo "Will build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-30 13:21 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-30 13:21 UTC (permalink / raw
To: gentoo-commits
commit: f636811e4dcdd14a9196d36e04fa4cc742ac83d2
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 13:20:20 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon May 30 13:20:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=f636811e
[sys-boot/grub] Add USE_EXPAND for platform. TODO: somehow make it not fail so we detect what useflag is possible on what cpu.
---
sys-boot/grub/Manifest | 4 +-
sys-boot/grub/grub-1.99.ebuild | 104 +++++++++++++++++++++++++++++++++-------
sys-boot/grub/grub-9999.ebuild | 104 +++++++++++++++++++++++++++++++++-------
3 files changed, 176 insertions(+), 36 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e99e876..31425b7 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 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922
-EBUILD grub-9999.ebuild 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922
+EBUILD grub-1.99.ebuild 5608 RMD160 7d5fc5f793e025bc271077c02d5942f19a2f2a61 SHA1 7a6087fd1c58d6566b5eab0faecf4b192b1502dd SHA256 b68ca2209a986c683177e8abb2f5c98d25820a919388880e52eeb82b5f339c9e
+EBUILD grub-9999.ebuild 5608 RMD160 7d5fc5f793e025bc271077c02d5942f19a2f2a61 SHA1 7a6087fd1c58d6566b5eab0faecf4b192b1502dd SHA256 b68ca2209a986c683177e8abb2f5c98d25820a919388880e52eeb82b5f339c9e
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 a00a605..2d41728 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -2,9 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-# FIXME: somehow depend on python-2 only; using python eclass maybe?
-# NOTE: good idea would be to move grub-2 to new package called grub2
-
EAPI=4
if [[ ${PV} == "9999" ]] ; then
@@ -29,6 +26,12 @@ SLOT="0"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+GRUB_PLATFORMS="coreboot efi emu ieee1275 pc qemu yeeloong"
+for i in ${GRUB_PLATFORMS}; do
+ IUSE+=" grub_platform_${i}"
+done
+unset i
+
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
@@ -59,23 +62,34 @@ QA_EXECSTACK="
bin/grub-fstest
"
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+grub_run_phase() {
+ local phase=$1
+ local platform=$2
+ [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined"
+ [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
-src_prepare() {
- epatch_user
+ [[ -d "${WORKDIR}/build-${platform}" ]] || \
+ { mkdir "${WORKDIR}/build-${platform}" || die ; }
+ pushd "${WORKDIR}/build-${platform}" > /dev/null || die
- # autogen.sh does more than just run autotools
- if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/ d' autogen.sh || die
- (. ./autogen.sh) || die
- eautoreconf
- fi
+ echo ">>> Running ${phase} for platform \"${platform}\""
+ echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
+
+ grub_${phase} ${platform}
+
+ popd > /dev/null || die
}
-src_configure() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
+grub_src_configure() {
+ local platform=$1
+ [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+
+ [[ ${platform} == "guessed" ]] \
+ && platform="" \
+ || platform="--with-platform=${platform}"
+
+ ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
--disable-werror \
--sbindir=/sbin \
@@ -87,12 +101,68 @@ src_configure() {
$(use_enable nls) \
$(use_enable debug mm-debug) \
$(use sdl && use_enable debug grub-emu-sdl) \
- $(use_enable debug grub-emu-usb)
+ $(use_enable debug grub-emu-usb) \
+ ${platform}
+}
+
+grub_src_compile() {
+ default_src_compile
+}
+
+grub_src_install() {
+ default_src_install
+}
+
+src_prepare() {
+ local i
+
+ epatch_user
+
+ # autogen.sh does more than just run autotools
+ if [[ ${PV} == "9999" ]] ; then
+ sed -i -e '/^autoreconf/ d' autogen.sh || die
+ (. ./autogen.sh) || die
+ eautoreconf
+ fi
+
+ # get enabled platforms
+ GRUB_ENABLED_PLATFORMS=""
+ for i in ${GRUB_PLATFORMS}; do
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ done
+}
+
+src_configure() {
+ local i
+
+ use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use static && append-ldflags -static
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+}
+
+src_compile() {
+ local i
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
}
src_install() {
- default
+ local i
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+ # can't be in docs array as we use defualt_src_install in different builddir
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
insinto /etc/default
newins "${FILESDIR}"/grub.default grub
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a00a605..2d41728 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -2,9 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-# FIXME: somehow depend on python-2 only; using python eclass maybe?
-# NOTE: good idea would be to move grub-2 to new package called grub2
-
EAPI=4
if [[ ${PV} == "9999" ]] ; then
@@ -29,6 +26,12 @@ SLOT="0"
[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+GRUB_PLATFORMS="coreboot efi emu ieee1275 pc qemu yeeloong"
+for i in ${GRUB_PLATFORMS}; do
+ IUSE+=" grub_platform_${i}"
+done
+unset i
+
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
@@ -59,23 +62,34 @@ QA_EXECSTACK="
bin/grub-fstest
"
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+grub_run_phase() {
+ local phase=$1
+ local platform=$2
+ [[ -z ${phase} ]] && die "${FUNCNAME}: Phase is undefined"
+ [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
-src_prepare() {
- epatch_user
+ [[ -d "${WORKDIR}/build-${platform}" ]] || \
+ { mkdir "${WORKDIR}/build-${platform}" || die ; }
+ pushd "${WORKDIR}/build-${platform}" > /dev/null || die
- # autogen.sh does more than just run autotools
- if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/ d' autogen.sh || die
- (. ./autogen.sh) || die
- eautoreconf
- fi
+ echo ">>> Running ${phase} for platform \"${platform}\""
+ echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
+
+ grub_${phase} ${platform}
+
+ popd > /dev/null || die
}
-src_configure() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
+grub_src_configure() {
+ local platform=$1
+ [[ -z ${platform} ]] && die "${FUNCNAME}: Platform is undefined"
+
+ [[ ${platform} == "guessed" ]] \
+ && platform="" \
+ || platform="--with-platform=${platform}"
+
+ ECONF_SOURCE="${WORKDIR}/${P}/" \
econf \
--disable-werror \
--sbindir=/sbin \
@@ -87,12 +101,68 @@ src_configure() {
$(use_enable nls) \
$(use_enable debug mm-debug) \
$(use sdl && use_enable debug grub-emu-sdl) \
- $(use_enable debug grub-emu-usb)
+ $(use_enable debug grub-emu-usb) \
+ ${platform}
+}
+
+grub_src_compile() {
+ default_src_compile
+}
+
+grub_src_install() {
+ default_src_install
+}
+
+src_prepare() {
+ local i
+
+ epatch_user
+
+ # autogen.sh does more than just run autotools
+ if [[ ${PV} == "9999" ]] ; then
+ sed -i -e '/^autoreconf/ d' autogen.sh || die
+ (. ./autogen.sh) || die
+ eautoreconf
+ fi
+
+ # get enabled platforms
+ GRUB_ENABLED_PLATFORMS=""
+ for i in ${GRUB_PLATFORMS}; do
+ use grub_platform_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ done
+}
+
+src_configure() {
+ local i
+
+ use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use static && append-ldflags -static
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+}
+
+src_compile() {
+ local i
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
}
src_install() {
- default
+ local i
+
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && grub_run_phase ${FUNCNAME} guessed
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+ # can't be in docs array as we use defualt_src_install in different builddir
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
insinto /etc/default
newins "${FILESDIR}"/grub.default grub
cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-26 17:10 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-26 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 3fed246bf93eacd0797233dd1d8d94fbd4a3db2b
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 17:08:41 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu May 26 17:08:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=3fed246b
[sys-boot/grub] Depend on correct package for xorriso.
---
sys-boot/grub/Manifest | 6 +++---
sys-boot/grub/grub-1.99.ebuild | 4 ++--
sys-boot/grub/grub-9999.ebuild | 4 ++--
sys-boot/grub/metadata.xml | 1 -
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 88c0f4c..262c3ba 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663
-EBUILD grub-9999.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663
-MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
+EBUILD grub-1.99.ebuild 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3
+EBUILD grub-9999.ebuild 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3
+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 1fd2da9..6aecfdf 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -30,9 +30,9 @@ SLOT="0"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
# os-prober: Used on runtime to detect other OSes
-# xorriso: Used on runtime for mkrescue
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
- app-cdr/xorriso
+ dev-libs/libisoburn
dev-libs/lzo
sys-boot/os-prober
>=sys-libs/ncurses-5.2-r5
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1fd2da9..6aecfdf 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,9 +30,9 @@ SLOT="0"
IUSE="custom-cflags debug device-mapper nls static sdl truetype"
# os-prober: Used on runtime to detect other OSes
-# xorriso: Used on runtime for mkrescue
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
- app-cdr/xorriso
+ dev-libs/libisoburn
dev-libs/lzo
sys-boot/os-prober
>=sys-libs/ncurses-5.2-r5
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index a05c330..c2003e9 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -4,6 +4,5 @@
<herd>base-system</herd>
<use>
<flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
- <flag name='multislot'>Allow grub1 and grub2 to be installed simultaneously</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-25 20:07 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-25 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 93711e898411c4bfd49c0b21c1ef7f1c9367d940
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 20:05:32 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed May 25 20:05:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=93711e89
[sys-boot/grub] Add missing runtime dependencies. Add nls useflag.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 15 +++++++++++----
sys-boot/grub/grub-9999.ebuild | 12 +++++++++---
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index c8d038f..88c0f4c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 3795 RMD160 e228895b10916ed7923145b192f78e7419191f1a SHA1 2887688b4042ee8210753913ab8e2768a9a3b37e SHA256 02b14a8379e4d865290e5665e8259e97c75e67abff2a6d774add74bace052973
-EBUILD grub-9999.ebuild 3794 RMD160 1aeb21498d98f574816cf4759232c9b8cecfd513 SHA1 16dbda7f5c723db88c37f8cb986d2c2913e29819 SHA256 c87453c0f238ae55ef9e505e7689b862183a1d0cb442f54b23894dc5d26d1132
+EBUILD grub-1.99.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663
+EBUILD grub-9999.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663
MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 3b6edc5..1fd2da9 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -26,11 +26,16 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="custom-cflags debug device-mapper static sdl truetype"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-RDEPEND=">=sys-libs/ncurses-5.2-r5
+# os-prober: Used on runtime to detect other OSes
+# xorriso: Used on runtime for mkrescue
+RDEPEND="
+ app-cdr/xorriso
dev-libs/lzo
+ sys-boot/os-prober
+ >=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
)
@@ -61,8 +66,9 @@ src_prepare() {
# autogen.sh does more than just run autotools
if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+ sed -i -e '/^autoreconf/ d' autogen.sh || die
(. ./autogen.sh) || die
+ eautoreconf
fi
}
@@ -78,6 +84,7 @@ 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 38ae008..1fd2da9 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -26,11 +26,16 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug device-mapper static sdl truetype"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-RDEPEND=">=sys-libs/ncurses-5.2-r5
+# os-prober: Used on runtime to detect other OSes
+# xorriso: Used on runtime for mkrescue
+RDEPEND="
+ app-cdr/xorriso
dev-libs/lzo
+ sys-boot/os-prober
+ >=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
)
@@ -79,6 +84,7 @@ 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)
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-19 7:13 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-19 7:13 UTC (permalink / raw
To: gentoo-commits
commit: 0ebd8ed2794dbc81b319c247934e68bf01420223
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 07:12:56 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu May 19 07:12:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=0ebd8ed2
[sys-boot/grub] Fix eautoreconf failing the phase.
---
sys-boot/grub/Manifest | 2 +-
sys-boot/grub/grub-9999.ebuild | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4d8582a..c8d038f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
EBUILD grub-1.99.ebuild 3795 RMD160 e228895b10916ed7923145b192f78e7419191f1a SHA1 2887688b4042ee8210753913ab8e2768a9a3b37e SHA256 02b14a8379e4d865290e5665e8259e97c75e67abff2a6d774add74bace052973
-EBUILD grub-9999.ebuild 3784 RMD160 460b4d2aa35197d8b94c2578da819805474b5e5c SHA1 b4e2597456030d32ba3844f2a7a020657d38ffc5 SHA256 e957674b3978c1b9f90050249ea7d6aeb872a9e4882cbf5d4911e58031f41062
+EBUILD grub-9999.ebuild 3794 RMD160 1aeb21498d98f574816cf4759232c9b8cecfd513 SHA1 16dbda7f5c723db88c37f8cb986d2c2913e29819 SHA256 c87453c0f238ae55ef9e505e7689b862183a1d0cb442f54b23894dc5d26d1132
MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b2d01f5..38ae008 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -61,8 +61,9 @@ src_prepare() {
# autogen.sh does more than just run autotools
if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+ sed -i -e '/^autoreconf/ d' autogen.sh || die
(. ./autogen.sh) || die
+ eautoreconf
fi
}
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-15 13:09 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-15 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 950c286a2ae99db457b29c09d2d1be1de5a310d8
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 13:08:58 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 15 13:08:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=950c286a
[sys-boot/grub] Inform user to install the grub.
---
sys-boot/grub/Manifest | 4 ++--
sys-boot/grub/grub-1.99.ebuild | 2 ++
sys-boot/grub/grub-9999.ebuild | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 3c7603f..4d8582a 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 3727 RMD160 76994633ddc444cde38a2ac41a13fe6a5362ac74 SHA1 4c74a17f01716a272dcff339ef4e4526879db957 SHA256 00a3165b63901a09990470ee2d62541250c23d5e3a88a59c3958d39d6effd2a5
-EBUILD grub-9999.ebuild 3716 RMD160 ad966e0da4664a4f062240d069e9aa3169c1a47e SHA1 d5b68443369e354efa56c4d444cf640a829816cb SHA256 2565f1e432d61ba7fd55531f969b742daeeb9e04c193d813ab403370dfff35e5
+EBUILD grub-1.99.ebuild 3795 RMD160 e228895b10916ed7923145b192f78e7419191f1a SHA1 2887688b4042ee8210753913ab8e2768a9a3b37e SHA256 02b14a8379e4d865290e5665e8259e97c75e67abff2a6d774add74bace052973
+EBUILD grub-9999.ebuild 3784 RMD160 460b4d2aa35197d8b94c2578da819805474b5e5c SHA1 b4e2597456030d32ba3844f2a7a020657d38ffc5 SHA256 e957674b3978c1b9f90050249ea7d6aeb872a9e4882cbf5d4911e58031f41062
MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 81b2545..3b6edc5 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -116,6 +116,8 @@ setup_boot_dir() {
einfo "Even if we just created configuration for your grub-2 using old"
einfo "grub-1 configuration file you should migrate to use new style"
einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo
+ elog "Remember to run grub-install to install your grub!"
else
# we need to refresh the grub.cfg everytime just to play it safe
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 913e512..b2d01f5 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -116,6 +116,8 @@ setup_boot_dir() {
einfo "Even if we just created configuration for your grub-2 using old"
einfo "grub-1 configuration file you should migrate to use new style"
einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo
+ elog "Remember to run grub-install to install your grub!"
else
# we need to refresh the grub.cfg everytime just to play it safe
einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
^ permalink raw reply related [flat|nested] 22+ messages in thread* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/
@ 2011-05-15 12:47 Tomas Chvatal
0 siblings, 0 replies; 22+ messages in thread
From: Tomas Chvatal @ 2011-05-15 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 524abd91dc3dfc13977dffee87e09a1c233055f1
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 12:46:49 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 15 12:46:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=524abd91
[sys-boot/grub] Add my version of grub2.
---
sys-boot/grub/Manifest | 4 +
sys-boot/grub/grub-1.99.ebuild | 137 ++++++++++++++++++++++++++++++++++++++++
sys-boot/grub/grub-9999.ebuild | 137 ++++++++++++++++++++++++++++++++++++++++
sys-boot/grub/metadata.xml | 9 +++
4 files changed, 287 insertions(+), 0 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
new file mode 100644
index 0000000..1f1fdcf
--- /dev/null
+++ b/sys-boot/grub/Manifest
@@ -0,0 +1,4 @@
+DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
+EBUILD grub-1.99.ebuild 3727 RMD160 76994633ddc444cde38a2ac41a13fe6a5362ac74 SHA1 4c74a17f01716a272dcff339ef4e4526879db957 SHA256 00a3165b63901a09990470ee2d62541250c23d5e3a88a59c3958d39d6effd2a5
+EBUILD grub-9999.ebuild 3716 RMD160 ad966e0da4664a4f062240d069e9aa3169c1a47e SHA1 d5b68443369e354efa56c4d444cf640a829816cb SHA256 2565f1e432d61ba7fd55531f969b742daeeb9e04c193d813ab403370dfff35e5
+MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
new file mode 100644
index 0000000..81b2545
--- /dev/null
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# FIXME: somehow depend on python-2 only; using python eclass maybe?
+# NOTE: good idea would be to move grub-2 to new package called grub2
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+ EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+ LIVE_ECLASS="autotools bzr"
+ SRC_URI=""
+else
+ MY_P=${P/_/\~}
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ mirror://gentoo/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+fi
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags debug device-mapper static sdl truetype"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+ dev-libs/lzo
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/python-2.5.2
+"
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+else
+ DEPEND+=" app-arch/xz-utils"
+fi
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="
+ sbin/grub-probe
+ sbin/grub-setup
+ sbin/grub-mkdevicemap
+ bin/grub-script-check
+ bin/grub-fstest
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+ epatch_user
+
+ # autogen.sh does more than just run autotools
+ if [[ ${PV} == "9999" ]] ; then
+ sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+ (. ./autogen.sh) || die
+ fi
+}
+
+src_configure() {
+ use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use static && append-ldflags -static
+
+ econf \
+ --disable-werror \
+ --sbindir=/sbin \
+ --bindir=/bin \
+ --libdir=/$(get_libdir) \
+ --disable-efiemu \
+ $(use_enable device-mapper) \
+ $(use_enable truetype grub-mkfont) \
+ $(use_enable debug mm-debug) \
+ $(use sdl && use_enable debug grub-emu-sdl) \
+ $(use_enable debug grub-emu-usb)
+}
+
+src_install() {
+ default
+
+ insinto /etc/default
+ newins "${FILESDIR}"/defaults grub
+ cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+ GRUB_DISTRIBUTOR="Gentoo"
+EOF
+}
+
+setup_boot_dir() {
+ local dir=$1
+
+ if [[ ! -e ${dir}/grub.cfg ]]; then
+ # display the link to guide if user didn't set up anything yet.
+ elog "For informations how to configure grub-2 please reffer to guide:"
+ # FIXME: we don't have any guide yet!
+ # Lets just use archlinux wiki until we have some.
+ elog " https://wiki.archlinux.org/index.php/GRUB2"
+ fi
+
+ if [[ ! -e ${dir}/grub.cfg && -e ${dir}/menu.lst ]] ; then
+ # This is first grub2 install and we have old configuraton for
+ # grub1 around. Lets try to generate grub.cfg from it so user
+ # does not loose any stuff when rebooting.
+ # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
+ einfo "Running: grub-menulst2cfg '${dir}/menu.lst' '${dir}/grub.cfg'"
+ grub-menulst2cfg "${dir}/menu.lst" "${dir}/grub.cfg" || \
+ ewarn "Running grub-menulst2cfg failed!"
+
+ einfo "Even if we just created configuration for your grub-2 using old"
+ einfo "grub-1 configuration file you should migrate to use new style"
+ einfo "configuration in '${ROOT}/etc/grub.d'."
+ else
+ # we need to refresh the grub.cfg everytime just to play it safe
+ einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+ grub-mkconfig -o "${dir}/grub.cfg" || \
+ ewarn "Running grub-mkconfig failed! Check your configuration files!"
+ fi
+
+ elog "Remember to run \"grub-mkconfig -o '${dir}/grub.cfg'\" every time"
+ elog "you update the configuration files."
+}
+
+pkg_postinst() {
+ mount-boot_mount_boot_partition
+
+ setup_boot_dir "${ROOT}"boot/grub
+
+ # needs to be called after we call setup_boot_dir
+ mount-boot_pkg_postinst
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
new file mode 100644
index 0000000..913e512
--- /dev/null
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# FIXME: somehow depend on python-2 only; using python eclass maybe?
+# NOTE: good idea would be to move grub-2 to new package called grub2
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+ EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+ LIVE_ECLASS="autotools bzr"
+ SRC_URI=""
+else
+ MY_P=${P/_/\~}
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ mirror://gentoo/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+fi
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="custom-cflags debug device-mapper static sdl truetype"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+ dev-libs/lzo
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/python-2.5.2
+"
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+else
+ DEPEND+=" app-arch/xz-utils"
+fi
+
+export STRIP_MASK="*/grub/*/*.mod"
+QA_EXECSTACK="
+ sbin/grub-probe
+ sbin/grub-setup
+ sbin/grub-mkdevicemap
+ bin/grub-script-check
+ bin/grub-fstest
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+ epatch_user
+
+ # autogen.sh does more than just run autotools
+ if [[ ${PV} == "9999" ]] ; then
+ sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
+ (. ./autogen.sh) || die
+ fi
+}
+
+src_configure() {
+ use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use static && append-ldflags -static
+
+ econf \
+ --disable-werror \
+ --sbindir=/sbin \
+ --bindir=/bin \
+ --libdir=/$(get_libdir) \
+ --disable-efiemu \
+ $(use_enable device-mapper) \
+ $(use_enable truetype grub-mkfont) \
+ $(use_enable debug mm-debug) \
+ $(use sdl && use_enable debug grub-emu-sdl) \
+ $(use_enable debug grub-emu-usb)
+}
+
+src_install() {
+ default
+
+ insinto /etc/default
+ newins "${FILESDIR}"/defaults grub
+ cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+ GRUB_DISTRIBUTOR="Gentoo"
+EOF
+}
+
+setup_boot_dir() {
+ local dir=$1
+
+ if [[ ! -e ${dir}/grub.cfg ]]; then
+ # display the link to guide if user didn't set up anything yet.
+ elog "For informations how to configure grub-2 please reffer to guide:"
+ # FIXME: we don't have any guide yet!
+ # Lets just use archlinux wiki until we have some.
+ elog " https://wiki.archlinux.org/index.php/GRUB2"
+ fi
+
+ if [[ ! -e ${dir}/grub.cfg && -e ${dir}/menu.lst ]] ; then
+ # This is first grub2 install and we have old configuraton for
+ # grub1 around. Lets try to generate grub.cfg from it so user
+ # does not loose any stuff when rebooting.
+ # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
+ einfo "Running: grub-menulst2cfg '${dir}/menu.lst' '${dir}/grub.cfg'"
+ grub-menulst2cfg "${dir}/menu.lst" "${dir}/grub.cfg" || \
+ ewarn "Running grub-menulst2cfg failed!"
+
+ einfo "Even if we just created configuration for your grub-2 using old"
+ einfo "grub-1 configuration file you should migrate to use new style"
+ einfo "configuration in '${ROOT}/etc/grub.d'."
+ else
+ # we need to refresh the grub.cfg everytime just to play it safe
+ einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
+ grub-mkconfig -o "${dir}/grub.cfg" || \
+ ewarn "Running grub-mkconfig failed! Check your configuration files!"
+ fi
+
+ elog "Remember to run \"grub-mkconfig -o '${dir}/grub.cfg'\" every time"
+ elog "you update the configuration files."
+}
+
+pkg_postinst() {
+ mount-boot_mount_boot_partition
+
+ setup_boot_dir "${ROOT}"boot/grub
+
+ # needs to be called after we call setup_boot_dir
+ mount-boot_pkg_postinst
+}
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
new file mode 100644
index 0000000..a05c330
--- /dev/null
+++ b/sys-boot/grub/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
+ <flag name='multislot'>Allow grub1 and grub2 to be installed simultaneously</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2011-08-26 18:18 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-05 21:22 [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/ Tomas Chvatal
-- strict thread matches above, loose matches on Subject: below --
2011-08-26 18:18 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-12 10:02 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 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox