Add a pkg_config() foby Petteri Räty for users to configure other devices #133129.

Package-Manager: portage-2.1_pre10-r5

3 files changed, 56 insertions, 21 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 0fd19b39d944..dc1bc913bf78 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.61 2006/04/27 22:44:26 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.62 2006/05/13 04:59:32 vapier Exp $
+
+  13 May 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r2.ebuild:
+  Add a pkg_config() foby Petteri Räty for users to configure other devices
+  #133129.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-grub-0.92-r1,
   files/digest-grub-0.94-r1, files/digest-grub-0.96-r1, Manifest:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f4d5be4a0626..790e7322c9b8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe size 21727
 DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37 size 877112
 DIST grub-0.94-gentoo-0.1.tar.bz2 40585 RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3 size 40585
@@ -31,10 +34,10 @@ EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb
 MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb grub-0.96-r3.ebuild 4577
 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c grub-0.96-r3.ebuild 4577
-EBUILD grub-0.97-r2.ebuild 4388 RMD160 5cae654d28fef5ee64e96b03978bfa75ec24a79d SHA1 855a14e693d56fa9ff39018519de8e94c4b8daed SHA256 3c45354c91ad357b31db984922b7a3b5252786ff0ee1838c5b92b1f9a54ddef4 size 4388
-MD5 183868e62715082372b5732094c25bc0 grub-0.97-r2.ebuild 4388
-RMD160 5cae654d28fef5ee64e96b03978bfa75ec24a79d grub-0.97-r2.ebuild 4388
-SHA256 3c45354c91ad357b31db984922b7a3b5252786ff0ee1838c5b92b1f9a54ddef4 grub-0.97-r2.ebuild 4388
+EBUILD grub-0.97-r2.ebuild 4839 RMD160 3e49e8e14460127d325d654ac407d77d1d948958 SHA1 4775785ee479098a2c6c4525564055a42133653f SHA256 e4ee203b2da89f59ada34c84e8b422cc8f119a81825a28135ff2ac15bfc04821 size 4839
+MD5 c1e257d57441b87e594d5408037b94e2 grub-0.97-r2.ebuild 4839
+RMD160 3e49e8e14460127d325d654ac407d77d1d948958 grub-0.97-r2.ebuild 4839
+SHA256 e4ee203b2da89f59ada34c84e8b422cc8f119a81825a28135ff2ac15bfc04821 grub-0.97-r2.ebuild 4839
 EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA1 07484f2e49a04c267a8f3dec6118b4a2833dbdcd SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6 size 4518
 MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518
@@ -43,10 +46,10 @@ EBUILD grub-1.93.ebuild 972 RMD160 c42b0abd1ab17d1e7f2e662370ba1a31642c12aa SHA1
 MD5 6d507b25d99cec26059ab31000c034e5 grub-1.93.ebuild 972
 RMD160 c42b0abd1ab17d1e7f2e662370ba1a31642c12aa grub-1.93.ebuild 972
 SHA256 dac3ed7dcc800e3f460ac5634cca38e31f1f07dbbdfa8ac7dcb386b206d10da0 grub-1.93.ebuild 972
-MISC ChangeLog 17211 RMD160 17de640ce31585de35a02b18cd4bf41bbb1e2a5f SHA1 230925f7f79401cf393ad667d7b802892614d072 SHA256 de46f2ad6e37390cab5bba74493e0528680d039542623b4f5187bb91ed44ff1b size 17211
-MD5 fe3ead4c77298c2ee27e773d519357dd ChangeLog 17211
-RMD160 17de640ce31585de35a02b18cd4bf41bbb1e2a5f ChangeLog 17211
-SHA256 de46f2ad6e37390cab5bba74493e0528680d039542623b4f5187bb91ed44ff1b ChangeLog 17211
+MISC ChangeLog 17370 RMD160 88eab4d746062fcca926872167263ebfe4f57aed SHA1 57f0bb822a663e030d1d379c45a80b17d5eee813 SHA256 78317fa263d04057c667cfe97774d930747642dff031f5fc8faa20d12ab1522e size 17370
+MD5 fe8413fb7077e97ac0791c9600c17fe6 ChangeLog 17370
+RMD160 88eab4d746062fcca926872167263ebfe4f57aed ChangeLog 17370
+SHA256 78317fa263d04057c667cfe97774d930747642dff031f5fc8faa20d12ab1522e ChangeLog 17370
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -75,3 +78,10 @@ SHA256 b0934e5e43d1417abb03e4adc7fbe5b3b6c36bc4db651ceaf832a6eff42bb931 files/di
 MD5 2de03fd30096aa59a29cbd9bb32f4a9e files/digest-grub-1.93 229
 RMD160 c5b4e34a017f1934fc05acf0bb6bcdc2fd0cc792 files/digest-grub-1.93 229
 SHA256 d1d4c28529e592e806752798fc85d448dbb2b2e07eb328152679e66820729c17 files/digest-grub-1.93 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEZWgc2+ySkm8kpY0RAiETAJ4mW8uuJvI9JHMuDFXl+akQXj/W6gCgt0sa
+ZzHWBDQ3EEL4zmP9HPct4Ug=
+=WdWL
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 2c9c23e88895..799760c2b487 100644
--- a/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.5 2006/03/22 03:40:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.6 2006/05/13 04:59:32 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -120,30 +120,51 @@ src_install() {
 	newdoc docs/menu.lst grub.conf.sample
 }
 
-pkg_postinst() {
-	[[ ${ROOT} != "/" ]] && return 0
+setup_boot_dir() {
+	local dir="${1}"
+
+	[[ ! -e "${dir}" ]] && die "${dir} does not exist!"
+
+	[[ ! -e "${dir}/grub" ]] && mkdir "${dir}/grub"
 
 	# change menu.lst to grub.conf
-	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
-		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+	if [[ ! -e "${dir}/grub/grub.conf" && -e "${dir}/grub/menu.lst" ]] ; then
+		mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf"
 		ewarn
 		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
 		ewarn
 	fi
+
+	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
 	einfo "Linking from new grub.conf name to menu.lst"
-	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+		ln -snf grub.conf "${dir}/grub/menu.lst"
+	fi
 
-	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
 
-	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
 	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p ${x} /boot/grub/
+		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
 	done
 
-	if [[ -e /boot/grub/grub.conf ]] ; then
-		egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' /boot/grub/grub.conf | \
+	if [[ -e "${dir}"/grub/grub.conf ]] ; then
+		egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \
 		/sbin/grub --batch \
-			--device-map=/boot/grub/device.map \
+			--device-map="${dir}"/grub/device.map \
 			> /dev/null
 	fi
 }
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	setup_boot_dir /boot
+	einfo "To install grub files to another device (like a usb stick), just run:"
+	einfo "   emerge --config =${PF}"
+}
+
+pkg_config() {
+	local dir
+	einfo "Enter the directory where you want to setup grub:"
+	read dir
+	setup_boot_dir ${dir}
+}