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

minor cleanups

Browse source
This commit is contained in:
BVK Chaitanya 2010-08-19 17:50:05 +05:30
parent 16c7cb32c8
commit 34980574fc
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure.ac
View file

@ -13,6 +13,25 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
dnl This configure script is complicated, because GRUB needs to deal
dnl with three potentially different types:
dnl
dnl build -- the environment for building GRUB
dnl host -- the environment for running utilities
dnl target -- the environment for running GRUB
dnl
dnl In addition, GRUB needs to deal with a platform specification
dnl which specifies the system running GRUB, such as firmware.
dnl This is necessary because the target type in autoconf does not
dnl describe such a system very well.
dnl
dnl The current strategy is to use variables with no prefix (such as
dnl CC, CFLAGS, etc.) for the host type as well as the build type,
dnl because GRUB does not need to use those variables for the build
dnl type, so there is no conflict. Variables with the prefix "TARGET_"
dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
dnl type.
AC_INIT([GRUB],[1.98],[bug-grub@gnu.org]) AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
# We don't want -g -O2 by default in CFLAGS # We don't want -g -O2 by default in CFLAGS
@ -879,10 +898,9 @@ else
mkdir -p include/grub 2>/dev/null mkdir -p include/grub 2>/dev/null
rm -rf include/grub/cpu rm -rf include/grub/cpu
cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu 2>/dev/null
if test "$platform" != emu ; then if test "$platform" != emu ; then
rm -rf include/grub/machine rm -rf include/grub/machine
cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
fi fi
fi fi

2
tests/example_grub_script_test.in
View file

@ -1,3 +1,3 @@
#! @abs_top_builddir@/grub-shell-tester --modules=echo #! @builddir@/grub-shell-tester --modules=echo
echo "hello world" echo "hello world"

2
tests/util/grub-shell-tester.in
View file

@ -91,7 +91,7 @@ if [ "x${source}" = x ] ; then
fi fi
outfile1=`mktemp` outfile1=`mktemp`
@abs_top_builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1} @builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
outfile2=`mktemp` outfile2=`mktemp`
bash ${source} >${outfile2} bash ${source} >${outfile2}

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

@ -124,7 +124,7 @@ halt
EOF EOF
isofile=`mktemp` isofile=`mktemp`
sh @abs_top_builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \ sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
--override-directory=${builddir}/grub-core --output=${isofile} \ --override-directory=${builddir}/grub-core --output=${isofile} \
boot/grub/grub.cfg=${cfgfile} \ boot/grub/grub.cfg=${cfgfile} \
/boot/grub/testcase.cfg=${source} >/dev/null 2>&1 /boot/grub/testcase.cfg=${source} >/dev/null 2>&1