public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/files/, sys-boot/grub/
@ 2011-05-15 12:57 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-05-15 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     7c63c68138d31cf313aaeb2121402320cadf6ba5
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 12:56:51 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 15 12:56:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=7c63c681

[sys-boot/grub] Add missing defaults.

---
 sys-boot/grub/Manifest       |    1 +
 sys-boot/grub/files/defaults |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1f1fdcf..3c7603f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,4 @@
+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

diff --git a/sys-boot/grub/files/defaults b/sys-boot/grub/files/defaults
new file mode 100644
index 0000000..25e5909
--- /dev/null
+++ b/sys-boot/grub/files/defaults
@@ -0,0 +1,30 @@
+# /etc/defaults/grub
+# If you change this file, run 'grub-mkconfig -o /boot/grub/grub.cfg'
+# afterwords to update /boot/grub/grub.cfg.  Make sure your /boot is
+# mounted rw before executing this command.
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.  This wiki also has random bits of info:
+# http://en.gentoo-wiki.com/wiki/Grub2#Using_variables
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entrys
+#GRUB_DISABLE_RECOVERY=true



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/files/, sys-boot/grub/
@ 2011-05-29 13:56 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-05-29 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f9ff8559427ede92e748c303b6bb16fea139e076
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 13:55:43 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun May 29 13:55:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=f9ff8559

[sys-boot/grub] Rework the default file for the grub.

---
 sys-boot/grub/Manifest           |    6 +++---
 sys-boot/grub/files/defaults     |   30 ------------------------------
 sys-boot/grub/files/grub.default |   36 ++++++++++++++++++++++++++++++++++++
 sys-boot/grub/grub-1.99.ebuild   |    2 +-
 sys-boot/grub/grub-9999.ebuild   |    2 +-
 5 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 262c3ba..e99e876 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
-AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
+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 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3
-EBUILD grub-9999.ebuild 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3
+EBUILD grub-1.99.ebuild 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922
+EBUILD grub-9999.ebuild 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922
 MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64

diff --git a/sys-boot/grub/files/defaults b/sys-boot/grub/files/defaults
deleted file mode 100644
index 25e5909..0000000
--- a/sys-boot/grub/files/defaults
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/defaults/grub
-# If you change this file, run 'grub-mkconfig -o /boot/grub/grub.cfg'
-# afterwords to update /boot/grub/grub.cfg.  Make sure your /boot is
-# mounted rw before executing this command.
-#
-# See the grub info page for documentation on possible variables and
-# their associated values.  This wiki also has random bits of info:
-# http://en.gentoo-wiki.com/wiki/Grub2#Using_variables
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-
-GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entrys
-#GRUB_DISABLE_RECOVERY=true

diff --git a/sys-boot/grub/files/grub.default b/sys-boot/grub/files/grub.default
new file mode 100644
index 0000000..78f96ac
--- /dev/null
+++ b/sys-boot/grub/files/grub.default
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values. 
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entrys
+#GRUB_DISABLE_RECOVERY=true

diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 6aecfdf..a00a605 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -94,7 +94,7 @@ src_install() {
 	default
 
 	insinto /etc/default
-	newins "${FILESDIR}"/defaults grub
+	newins "${FILESDIR}"/grub.default grub
 	cat <<-EOF >> "${D}"/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 6aecfdf..a00a605 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -94,7 +94,7 @@ src_install() {
 	default
 
 	insinto /etc/default
-	newins "${FILESDIR}"/defaults grub
+	newins "${FILESDIR}"/grub.default grub
 	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
 	GRUB_DISTRIBUTOR="Gentoo"
 EOF



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/files/, sys-boot/grub/
@ 2011-08-12 13:15 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-08-12 13:15 UTC (permalink / raw
  To: gentoo-commits

commit:     d031c627ad7b463d97f38cb2b66a5ad650568e00
Author:     Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Fri Aug 12 13:14:58 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 13:14:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=d031c627

Update a lot the src_install magic to be nicer.

---
 sys-boot/grub/Manifest           |    6 +++---
 sys-boot/grub/files/grub.default |    4 ++--
 sys-boot/grub/grub-1.99.ebuild   |   29 +++++++++--------------------
 sys-boot/grub/grub-9999.ebuild   |   29 +++++++++--------------------
 4 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index d0200ce..7f610ce 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
+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 7674 RMD160 873da5347010865f06807c51697384d54cf84608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b
-EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba2919096492a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f6896b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf
+EBUILD grub-1.99.ebuild 7267 RMD160 57fed8e4ebc094fa4b8b8604643523d8fc60425b SHA1 0aa4decbf894e4dd187c4684e4bccdbdd1c18cda SHA256 45c0adeb9b249716e0aed753c96768113759701da3d7ebd8b25758538ffa0dd9
+EBUILD grub-9999.ebuild 7267 RMD160 8e772a74a69033f00abb4a6827105117a2aeb248 SHA1 5bedf054f5ec99212020caa5c3a8e272fd202061 SHA256 861b2c580849eb8aa5153b002dc7106ff92c2cdc204d1a31e92c5324ca94eb7a
 MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64

diff --git a/sys-boot/grub/files/grub.default b/sys-boot/grub/files/grub.default
index 78f96ac..07972d9 100644
--- a/sys-boot/grub/files/grub.default
+++ b/sys-boot/grub/files/grub.default
@@ -4,7 +4,7 @@
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
-#     'grub-mkconfig -o /boot/grub/grub.cfg'
+#     'grub2-mkconfig -o /boot/grub2/grub.cfg'
 #
 # See the grub info page for documentation on possible variables and
 # their associated values. 
@@ -27,7 +27,7 @@ GRUB_CMDLINE_LINUX=""
 
 # Background image used on graphical terminal.
 # Can be in various bitmap formats.
-#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+#GRUB_BACKGROUND="/boot/grub2/mybackground.png"
 
 # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
 #GRUB_DISABLE_LINUX_UUID=true

diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index f3e2eb8..b682bf6 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -155,6 +155,7 @@ grub_src_configure() {
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
+		--program-transform-name=s,grub,grub2, \
 		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable nls) \
@@ -219,27 +220,15 @@ src_install() {
 		grub_run_phase ${FUNCNAME} ${i}
 	done
 
-	# Slot all binaries/info/man to state grub2-* instead of grub-*.
-	# Can this be done better?
-	grub_rename_files "${ED}"/sbin/
-	grub_rename_files "${ED}"/bin/
-	grub_rename_files deep "${ED}"/usr/share/info/
-	grub_rename_files deep "${ED}"/usr/share/man/man1/
-	grub_rename_files deep "${ED}"/usr/share/man/man8/
-	# Rename direct binaries calls in the bash scripts provided by grub
-	dosym /lib64/grub/grub-mkconfig_lib /lib64/grub/grub2-mkconfig_lib
-	sed -i \
-		-e 's:echo grub-:echo grub2-:' \
-		"${ED}"/{sbin,bin,lib64/grub}/*
-	sed -i \
-		-e 's:grub-:grub2-:'
-		"${ED}"/etc/grub.d/*
+	# slot all collisions with grub legacy
+	mv "${ED}"/usr/share/info/grub.info \
+		"${ED}"/usr/share/info/grub2.info || die
 
 	# 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 >> "${ED}"/lib*/grub/grub-mkconfig_lib
+	cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
 	GRUB_DISTRIBUTOR="Gentoo"
 EOF
 }
@@ -255,13 +244,13 @@ setup_boot_dir() {
 		elog "    https://wiki.archlinux.org/index.php/GRUB2"
 	fi
 
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir}/menu.lst ]] ; then
+	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/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: grub2-menulst2cfg '${dir}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir}/menu.lst" "${dir}/grub.cfg" || \
+		einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
+		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
 			ewarn "Running grub2-menulst2cfg failed!"
 
 		einfo "Even if we just created configuration for your grub-2 using old"
@@ -286,7 +275,7 @@ setup_boot_dir() {
 pkg_postinst() {
 	mount-boot_mount_boot_partition
 
-	setup_boot_dir "${ROOT}"boot/grub
+	setup_boot_dir "${ROOT}"boot/grub2
 
 	# 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
index bd8ad8c..00eb143 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -155,6 +155,7 @@ grub_src_configure() {
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
+		--program-transform-name=s,grub,grub2, \
 		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable nls) \
@@ -219,27 +220,15 @@ src_install() {
 		grub_run_phase ${FUNCNAME} ${i}
 	done
 
-	# Slot all binaries/info/man to state grub2-* instead of grub-*.
-	# Can this be done better?
-	grub_rename_files "${ED}"/sbin/
-	grub_rename_files "${ED}"/bin/
-	grub_rename_files deep "${ED}"/usr/share/info/
-	grub_rename_files deep "${ED}"/usr/share/man/man1/
-	grub_rename_files deep "${ED}"/usr/share/man/man8/
-	# Rename direct binaries calls in the bash scripts provided by grub
-	dosym /lib64/grub/grub-mkconfig_lib /lib64/grub/grub2-mkconfig_lib
-	sed -i \
-		-e 's:echo grub-:echo grub2-:' \
-		"${ED}"/{sbin,bin,lib64/grub}/*
-	sed -i \
-		-e 's:grub-:grub2-:'
-		"${ED}"/etc/grub.d/*
+	# slot all collisions with grub legacy
+	mv "${ED}"/usr/share/info/grub.info \
+		"${ED}"/usr/share/info/grub2.info || die
 
 	# 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 >> "${ED}"/lib*/grub/grub-mkconfig_lib
+	cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
 	GRUB_DISTRIBUTOR="Gentoo"
 EOF
 }
@@ -255,13 +244,13 @@ setup_boot_dir() {
 		elog "    https://wiki.archlinux.org/index.php/GRUB2"
 	fi
 
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir}/menu.lst ]] ; then
+	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/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: grub2-menulst2cfg '${dir}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir}/menu.lst" "${dir}/grub.cfg" || \
+		einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
+		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
 			ewarn "Running grub2-menulst2cfg failed!"
 
 		einfo "Even if we just created configuration for your grub-2 using old"
@@ -286,7 +275,7 @@ setup_boot_dir() {
 pkg_postinst() {
 	mount-boot_mount_boot_partition
 
-	setup_boot_dir "${ROOT}"boot/grub
+	setup_boot_dir "${ROOT}"boot/grub2
 
 	# needs to be called after we call setup_boot_dir
 	mount-boot_pkg_postinst



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/files/, sys-boot/grub/
@ 2011-08-27 12:40 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-08-27 12:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4ddc86880cca4e1ab525eef1ea8a7cd96c4842a4
Author:     Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Sun Aug 28 12:39:37 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 12:39:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=4ddc8688

Punt the grub2 that is now in main tree.

---
 sys-boot/grub/Manifest           |    5 -
 sys-boot/grub/files/grub.default |   36 -----
 sys-boot/grub/grub-1.99.ebuild   |  262 --------------------------------------
 sys-boot/grub/grub-9999.ebuild   |  262 --------------------------------------
 sys-boot/grub/metadata.xml       |    8 -
 5 files changed, 0 insertions(+), 573 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
deleted file mode 100644
index d044211..0000000
--- a/sys-boot/grub/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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 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/files/grub.default b/sys-boot/grub/files/grub.default
deleted file mode 100644
index 07972d9..0000000
--- a/sys-boot/grub/files/grub.default
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# To populate all changes in this file you need to regenerate your
-# grub configuration file afterwards:
-#     'grub2-mkconfig -o /boot/grub2/grub.cfg'
-#
-# See the grub info page for documentation on possible variables and
-# their associated values. 
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-
-GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal.
-# Note that you can use only modes which your graphic card supports via VBE.
-# You can see them in real GRUB with the command `vbeinfo'.
-#GRUB_GFXMODE=640x480
-
-# Background image used on graphical terminal.
-# Can be in various bitmap formats.
-#GRUB_BACKGROUND="/boot/grub2/mybackground.png"
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entrys
-#GRUB_DISABLE_RECOVERY=true

diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
deleted file mode 100644
index fcd5df1..0000000
--- a/sys-boot/grub/grub-1.99.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="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"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, yeeloong
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-	IUSE+=" grub_platforms_${i}"
-done
-unset i
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=sys-libs/ncurses-5.2-r5
-	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,img}"
-QA_EXECSTACK="
-	lib64/grub2/*/setjmp.mod
-	lib64/grub2/*/kernel.img
-	sbin/grub2-probe
-	sbin/grub2-setup
-	sbin/grub2-mkdevicemap
-	bin/grub2-script-check
-	bin/grub2-fstest
-	bin/grub2-mklayout
-	bin/grub2-menulst2cfg
-	bin/grub2-mkrelpath
-	bin/grub2-mkpasswd-pbkdf2
-	bin/grub2-mkfont
-	bin/grub2-editenv
-	bin/grub2-mkimage
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local target
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [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} == efi* ]]; then
-			# 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=${target}
-				--program-prefix=
-			"
-		else
-			platform=" --with-platform=${platform}"
-		fi
-	fi
-
-	ECONF_SOURCE="${WORKDIR}/${P}/" \
-	econf \
-		--disable-werror \
-		--sbindir=/sbin \
-		--bindir=/bin \
-		--libdir=/$(get_libdir) \
-		--disable-efiemu \
-		--program-transform-name=s,grub,grub2, \
-		$(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) \
-		${platform}
-}
-
-grub_src_compile() {
-	default_src_compile
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j archs
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	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
-		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}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	# slot all collisions with grub legacy
-	mv "${ED}"/usr/share/info/grub.info \
-		"${ED}"/usr/share/info/grub2.info || die
-
-	# 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 >> "${ED}"/lib*/grub2/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 the guide:"
-		elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
-	fi
-
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/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: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
-			ewarn "Running grub2-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'."
-		einfo
-
-	else
-		# we need to refresh the grub.cfg everytime just to play it safe
-		einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
-		grub2-mkconfig -o "${dir}/grub.cfg" || \
-			ewarn "Running grub2-mkconfig failed! Check your configuration files!"
-	fi
-
-	elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
-	elog "you update the configuration files!"
-
-	elog "Remember to run grub2-install to install your grub every time"
-	elog "you update this package!"
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	setup_boot_dir "${ROOT}"boot/grub2
-
-	# 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
deleted file mode 100644
index c841ea8..0000000
--- a/sys-boot/grub/grub-9999.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="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"
-# everywhere:
-#     emu
-# mips only:
-#     qemu-mips, loongson
-# amd64, x86, ppc, ppc64
-#     ieee1275
-# amd64, x86
-#     coreboot, multiboot, efi-32, pc, qemu
-# amd64
-#     efi-64
-for i in ${GRUB_PLATFORMS}; do
-	IUSE+=" grub_platforms_${i}"
-done
-unset i
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	dev-libs/libisoburn
-	dev-libs/lzo
-	sys-boot/os-prober
-	>=sys-libs/ncurses-5.2-r5
-	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,img}"
-QA_EXECSTACK="
-	lib64/grub2/*/setjmp.mod
-	lib64/grub2/*/kernel.img
-	sbin/grub2-probe
-	sbin/grub2-setup
-	sbin/grub2-mkdevicemap
-	bin/grub2-script-check
-	bin/grub2-fstest
-	bin/grub2-mklayout
-	bin/grub2-menulst2cfg
-	bin/grub2-mkrelpath
-	bin/grub2-mkpasswd-pbkdf2
-	bin/grub2-mkfont
-	bin/grub2-editenv
-	bin/grub2-mkimage
-"
-
-grub_run_phase() {
-	local phase=$1
-	local platform=$2
-	[[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
-
-	[[ -d "${WORKDIR}/build-${platform}" ]] || \
-		{ mkdir "${WORKDIR}/build-${platform}" || die ; }
-	pushd "${WORKDIR}/build-${platform}" > /dev/null || die
-
-	echo ">>> Running ${phase} for platform \"${platform}\""
-	echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
-
-	grub_${phase} ${platform}
-
-	popd > /dev/null || die
-}
-
-grub_src_configure() {
-	local platform=$1
-	local target
-
-	[[ -z ${platform} ]] && die "${FUNCNAME} [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} == efi* ]]; then
-			# 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=${target}
-				--program-prefix=
-			"
-		else
-			platform=" --with-platform=${platform}"
-		fi
-	fi
-
-	ECONF_SOURCE="${WORKDIR}/${P}/" \
-	econf \
-		--disable-werror \
-		--sbindir=/sbin \
-		--bindir=/bin \
-		--libdir=/$(get_libdir) \
-		--disable-efiemu \
-		--program-transform-name=s,grub,grub2, \
-		$(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) \
-		${platform}
-}
-
-grub_src_compile() {
-	default_src_compile
-}
-
-grub_src_install() {
-	default_src_install
-}
-
-src_prepare() {
-	local i j archs
-
-	epatch_user
-
-	# autogen.sh does more than just run autotools
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
-		(. ./autogen.sh) || die
-	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
-		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}"
-}
-
-src_configure() {
-	local i
-
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
-	use static && append-ldflags -static
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_compile() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-}
-
-src_install() {
-	local i
-
-	for i in ${GRUB_ENABLED_PLATFORMS}; do
-		grub_run_phase ${FUNCNAME} ${i}
-	done
-
-	# slot all collisions with grub legacy
-	mv "${ED}"/usr/share/info/grub.info \
-		"${ED}"/usr/share/info/grub2.info || die
-
-	# 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 >> "${ED}"/lib*/grub2/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 the guide:"
-		elog "    http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
-	fi
-
-	if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/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: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
-		grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
-			ewarn "Running grub2-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'."
-		einfo
-
-	else
-		# we need to refresh the grub.cfg everytime just to play it safe
-		einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
-		grub2-mkconfig -o "${dir}/grub.cfg" || \
-			ewarn "Running grub2-mkconfig failed! Check your configuration files!"
-	fi
-
-	elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
-	elog "you update the configuration files!"
-
-	elog "Remember to run grub2-install to install your grub every time"
-	elog "you update this package!"
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	setup_boot_dir "${ROOT}"boot/grub2
-
-	# 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
deleted file mode 100644
index c2003e9..0000000
--- a/sys-boot/grub/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</use>
-</pkgmetadata>



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-27 12:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-15 12:57 [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/files/, sys-boot/grub/ Tomas Chvatal
  -- strict thread matches above, loose matches on Subject: below --
2011-05-29 13:56 Tomas Chvatal
2011-08-12 13:15 Tomas Chvatal
2011-08-27 12:40 Tomas Chvatal

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