vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove platform and target_cpu replacement.

Browse source 
* 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.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 16:46:52 +01:00
parent 90cb2803d4
commit 53f13848f1
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2012-02-27 Vladimir Serbinenko <phcoder@gmail.com>
Autodetect platform in grub-install but allow override. Autodetect platform in grub-install but allow override.

3
configure.ac
View file

@ -186,9 +186,6 @@ AC_SUBST(host_cpu)
AC_SUBST(host_os) AC_SUBST(host_os)
AC_SUBST(host_kernel) AC_SUBST(host_kernel)
AC_SUBST(target_cpu)
AC_SUBST(platform)
# Define default variables # Define default variables
have_with_bootdir=n have_with_bootdir=n

5
tests/util/grub-shell.in
View file

@ -27,8 +27,6 @@ builddir="@builddir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@
platform=@platform@
# Force build directory components # Force build directory components
PATH="${builddir}:$PATH" 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" 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 "${cfgfile}" "$netdir/boot/grub/grub.cfg"
cp "${source}" "$netdir/boot/grub/testcase.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 else
"${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r" "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
fi fi

6
util/powerpc/ieee1275/grub-mkrescue.in
View file

@ -27,9 +27,7 @@ libdir="@libdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ input_dir="${libdir}/@PACKAGE@/powerpc-ieee1275"
platform=@platform@
pkglibdir="${libdir}/@PACKAGE@/${target_cpu}-${platform}"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then if [ "x$pkgdatadir" = x ]; then
@ -69,8 +67,6 @@ argument () {
echo $1 echo $1
} }
input_dir=${pkglibdir}
source= source=
output_image= output_image=