From 53f13848f1d2db0fa12b8b9d08640a8e8ab7c88c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 27 Feb 2012 16:46:52 +0100
Subject: [PATCH] 	Remove platform and target_cpu replacement.

	* configure.ac: Remove platform and target_cpu substitutions.
	* tests/util/grub-shell.in: Use modinfo.
	* util/powerpc/ieee1275/grub-mkrescue.in: Specify powerpc-ieee1275
	explicitly.
---
 ChangeLog                              | 9 +++++++++
 configure.ac                           | 3 ---
 tests/util/grub-shell.in               | 5 ++---
 util/powerpc/ieee1275/grub-mkrescue.in | 6 +-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86dabfd9e..35e2f4f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove platform and target_cpu replacement.
+
+	* configure.ac: Remove platform and target_cpu substitutions.
+	* tests/util/grub-shell.in: Use modinfo.
+	* util/powerpc/ieee1275/grub-mkrescue.in: Specify powerpc-ieee1275
+	explicitly.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Autodetect platform in grub-install but allow override.
diff --git a/configure.ac b/configure.ac
index 2663563e6..623938f50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,9 +186,6 @@ AC_SUBST(host_cpu)
 AC_SUBST(host_os)
 AC_SUBST(host_kernel)
 
-AC_SUBST(target_cpu)
-AC_SUBST(platform)
-
 # Define default variables
 
 have_with_bootdir=n
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index abb3bff1f..d0a2678a8 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -27,8 +27,6 @@ builddir="@builddir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
-target_cpu=@target_cpu@
-platform=@platform@
 
 # Force build directory components
 PATH="${builddir}:$PATH"
@@ -176,7 +174,8 @@ if [ x$boot = xnet ]; then
     sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir"
     cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
     cp "${source}" "$netdir/boot/grub/testcase.cfg"
-    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0"  -net nic  | cat | tr -d "\r"
+    . "${builddir}/grub-core/modinfo.sh"
+    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.0"  -net nic  | cat | tr -d "\r"
 else
     "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
 fi
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 41bd4f513..d73cd2e4a 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -27,9 +27,7 @@ libdir="@libdir@"
 PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
-target_cpu=@target_cpu@
-platform=@platform@
-pkglibdir="${libdir}/@PACKAGE@/${target_cpu}-${platform}"
+input_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
 datarootdir="@datarootdir@"
 datadir="@datadir@"
 if [ "x$pkgdatadir" = x ]; then
@@ -69,8 +67,6 @@ argument () {
   echo $1
 }
 
-input_dir=${pkglibdir}
-
 source=
 output_image=