Make sure netboot files are installed into /usr/lib/grub/${CHOST}/ so the pkg_postinst step works #103084 by Thomas Schweikle.

(Portage version: 2.0.51.22-r2)

6 files changed, 18 insertions, 12 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 8e5a7f029674..d88aec2652d8 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.51 2005/08/20 00:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.52 2005/08/21 02:24:04 vapier Exp $
+
+  21 Aug 2005; Mike Frysinger <vapier@gentoo.org> grub-0.94-r1.ebuild,
+  grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, grub-0.96-r3.ebuild,
+  grub-0.97.ebuild:
+  Make sure netboot files are installed into /usr/lib/grub/${CHOST}/ so the
+  pkg_postinst step works #103084 by Thomas Schweikle.
 
 *grub-0.97 (20 Aug 2005)
 
diff --git a/sys-boot/grub/grub-0.94-r1.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild
index b1efaaaea99b..01e71b23bcad 100644
--- a/sys-boot/grub/grub-0.94-r1.ebuild
+++ b/sys-boot/grub/grub-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.23 2005/08/05 03:15:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.24 2005/08/21 02:24:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -92,7 +92,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	exeinto /usr/lib/grub
+	exeinto /usr/lib/grub/${CHOST}
 	doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
 
 	insinto /boot/grub
diff --git a/sys-boot/grub/grub-0.96-r1.ebuild b/sys-boot/grub/grub-0.96-r1.ebuild
index a4c853aabab6..2d483090d9e3 100644
--- a/sys-boot/grub/grub-0.96-r1.ebuild
+++ b/sys-boot/grub/grub-0.96-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.14 2005/08/20 00:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.15 2005/08/21 02:24:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -113,7 +113,7 @@ src_test() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub
+	exeinto /usr/lib/grub/${CHOST}
 	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
 
 	insinto /boot/grub
diff --git a/sys-boot/grub/grub-0.96-r2.ebuild b/sys-boot/grub/grub-0.96-r2.ebuild
index 0b4de9c1c8fe..f9c1d4abc2c1 100644
--- a/sys-boot/grub/grub-0.96-r2.ebuild
+++ b/sys-boot/grub/grub-0.96-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.8 2005/08/20 00:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.9 2005/08/21 02:24:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -113,7 +113,7 @@ src_test() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub
+	exeinto /usr/lib/grub/${CHOST}
 	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
 
 	insinto /boot/grub
diff --git a/sys-boot/grub/grub-0.96-r3.ebuild b/sys-boot/grub/grub-0.96-r3.ebuild
index cee42fba7382..28145f4d89da 100644
--- a/sys-boot/grub/grub-0.96-r3.ebuild
+++ b/sys-boot/grub/grub-0.96-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.2 2005/08/20 00:03:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.3 2005/08/21 02:24:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -112,7 +112,7 @@ src_test() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	exeinto /usr/lib/grub
+	exeinto /usr/lib/grub/${CHOST}
 	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
 
 	insinto /boot/grub
diff --git a/sys-boot/grub/grub-0.97.ebuild b/sys-boot/grub/grub-0.97.ebuild
index 0a75510d9c61..2ca8af3edd43 100644
--- a/sys-boot/grub/grub-0.97.ebuild
+++ b/sys-boot/grub/grub-0.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.1 2005/08/20 00:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.2 2005/08/21 02:24:04 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -113,8 +113,8 @@ src_test() {
 src_install() {
 	make DESTDIR="${D}" install || die
 	if use netboot ; then
-		exeinto /usr/lib/grub
-		doexe nbgrub pxegrub stage2/stage2.netboot
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
 	fi
 
 	insinto /boot/grub