Description: Handle new autotools, and add some missing quotes in the process Backported by Colin Watson; I modified this to keep update-grub_lib in place until such time as we upgrade to a newer upstream snapshot. Author: Vladimir Serbinenko Origin: backport, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3766 Last-Update: 2012-01-31 Index: b/Makefile.am =================================================================== --- a/Makefile.am +++ b/Makefile.am @@ -101,8 +101,8 @@ # Install config.h into platformdir platform_HEADERS = config.h -pkglib_DATA += grub-mkconfig_lib -pkglib_DATA += update-grub_lib +pkgdata_DATA += grub-mkconfig_lib +pkgdata_DATA += update-grub_lib if COND_i386_coreboot Index: b/conf/Makefile.common =================================================================== --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -137,7 +137,7 @@ man_MANS = noinst_DATA = -pkglib_DATA = +pkgdata_DATA = bin_SCRIPTS = sbin_SCRIPTS = bin_PROGRAMS = @@ -147,7 +147,6 @@ grubconf_DATA = check_PROGRAMS = noinst_SCRIPTS = -pkglib_SCRIPTS = noinst_PROGRAMS = grubconf_SCRIPTS = noinst_LIBRARIES = Index: b/tests/util/grub-shell-tester.in =================================================================== --- a/tests/util/grub-shell-tester.in +++ b/tests/util/grub-shell-tester.in @@ -19,18 +19,17 @@ # Initialize some variables. transform="@program_transform_name@" -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -builddir=@builddir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +builddir="@builddir@" PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ target_cpu=@target_cpu@ # Force build directory components -PATH=${builddir}:$PATH +PATH="${builddir}:$PATH" export PATH # Usage: usage @@ -85,23 +84,23 @@ if [ "x${source}" = x ] ; then tmpfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 while read REPLY; do - echo $REPLY >> ${tmpfile} + echo $REPLY >> "${tmpfile}" done - source=${tmpfile} + source="${tmpfile}" fi outfile1=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 -@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1} +"@builddir@/grub-shell" --qemu-opts="${qemuopts}" --modules=${modules} "${source}" >"${outfile1}" outfile2=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 -bash ${source} >${outfile2} +bash "${source}" >"${outfile2}" -if ! diff -q ${outfile1} ${outfile2} >/dev/null +if ! diff -q "${outfile1}" "${outfile2}" >/dev/null then echo "${source}: GRUB and BASH outputs did not match (see diff -u ${outfile1} ${outfile2})" status=1 else - rm -f ${outfile1} ${outfile2} + rm -f "${outfile1}" "${outfile2}" fi exit $status Index: b/tests/util/grub-shell.in =================================================================== --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -19,11 +19,10 @@ # Initialize some variables. transform="@program_transform_name@" -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -builddir=@builddir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +builddir="@builddir@" PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ @@ -31,7 +30,7 @@ platform=@platform@ # Force build directory components -PATH=${builddir}:$PATH +PATH="${builddir}:$PATH" export PATH # Usage: usage @@ -140,9 +139,9 @@ isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 if [ x$boot != xnet ]; then - sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \ + sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \ --rom-directory="${rom_directory}" \ - /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \ + "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \ ${files} >/dev/null 2>&1 fi if [ x$boot = xhd ]; then @@ -173,12 +172,12 @@ if [ x$boot = xnet ]; then netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 - 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" + 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" 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 rm -f "${isofile}" "${imgfile}" rm -rf "${rom_directory}" Index: b/util/grub-install.in =================================================================== --- a/util/grub-install.in +++ b/util/grub-install.in @@ -21,6 +21,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" sbindir="@sbindir@" bindir="@bindir@" libdir="@libdir@" @@ -32,6 +33,7 @@ platform=@platform@ host_os=@host_os@ pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`" +datadir="@datadir@" localedir="@datadir@/locale" self="`basename $0`" Index: b/util/grub-mkconfig.in =================================================================== --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -18,26 +18,27 @@ # along with GRUB. If not, see . transform="@program_transform_name@" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sbindir=@sbindir@ -bindir=@bindir@ -libdir=@libdir@ -sysconfdir=@sysconfdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" + +prefix="@prefix@" +exec_prefix="@exec_prefix@" +sbindir="@sbindir@" +bindir="@bindir@" +sysconfdir="@sysconfdir@" PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ host_os=@host_os@ -datarootdir=@datarootdir@ -datadir=@datadir@ -pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"` +datadir="@datadir@" +pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" grub_cfg="" -grub_mkconfig_dir=${sysconfdir}/grub.d +grub_mkconfig_dir="${sysconfdir}"/grub.d self=`basename $0` -grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed "${transform}"` -grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"` +grub_mkdevicemap="${sbindir}/`echo grub-mkdevicemap | sed "${transform}"`" +grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` @@ -95,7 +96,7 @@ esac done -. ${libdir}/grub/grub-mkconfig_lib +. "${datadir}/grub/grub-mkconfig_lib" if [ "x$EUID" = "x" ] ; then EUID=`id -u` Index: b/util/grub-mknetdir.in =================================================================== --- a/util/grub-mknetdir.in +++ b/util/grub-mknetdir.in @@ -19,25 +19,23 @@ # Initialize some variables. transform="@program_transform_name@" -prefix=@prefix@ -exec_prefix=@exec_prefix@ -sbindir=@sbindir@ -bindir=@bindir@ -libdir=@libdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +bindir="@bindir@" +libdir="@libdir@" PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ target_cpu=@target_cpu@ platform=@platform@ host_os=@host_os@ -pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` -localedir=@datadir@/locale native_platform=@platform@ pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" self=`basename $0` -grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` +grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" rootdir=/srv/tftp grub_prefix=`echo /boot/grub | sed ${transform}` modules= @@ -48,7 +46,7 @@ debug=no debug_image= subdir=`echo /boot/grub | sed ${transform}` -pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc +pc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc" # Usage: usage # Print the usage. @@ -170,12 +168,12 @@ config_opt= mkdir -p "$grubdir" || exit 1 - for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do - if test -f $file && [ "`basename $file`" != menu.lst ]; then - rm -f $file || exit 1 + for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do + if test -f "$file" && [ "`basename $file`" != menu.lst ]; then + rm -f "$file" || exit 1 fi done - for file in ${input_dir}/*.mod; do + for file in "${input_dir}"/*.mod; do if test -f "$file"; then cp -f "$file" "$grubdir/" fi @@ -213,7 +211,7 @@ source ${subdir}/grub.cfg EOF - $grub_mkimage ${config_opt} -d "${input_dir}" -O ${mkimage_target} --output=${grubdir}/core.$ext --prefix=$prefix $modules $netmodules || exit 1 + "$grub_mkimage" ${config_opt} -d "${input_dir}" -O ${mkimage_target} "--output=${grubdir}/core.$ext" "--prefix=$prefix" $modules $netmodules || exit 1 echo "Netboot directory for ${platform} created. Configure your DHCP server to point to ${subdir}/${platform}/core.$ext" } Index: b/util/grub-mkrescue.in =================================================================== --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -18,12 +18,14 @@ # along with GRUB. If not, see . # Initialize some variables. + transform="@program_transform_name@" -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +bindir="@bindir@" +libdir="@libdir@" PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ Index: b/util/grub.d/00_header.in =================================================================== --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -19,13 +19,13 @@ transform="@program_transform_name@" -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}` grub_lang=`echo $LANG | cut -d . -f 1` -. ${libdir}/grub/grub-mkconfig_lib +. "@datadir@/grub/grub-mkconfig_lib" # Do this as early as possible, since other commands might depend on it. # (e.g. the `loadfont' command might need lvm or raid modules) @@ -112,7 +112,7 @@ done if [ "x$serial" = x1 ]; then - if ! test -e ${GRUB_PREFIX}/serial.mod ; then + if ! test -e "${GRUB_PREFIX}/serial.mod" ; then echo "Serial terminal not available on this platform." >&2 ; exit 1 fi Index: b/util/grub.d/10_hurd.in =================================================================== --- a/util/grub.d/10_hurd.in +++ b/util/grub.d/10_hurd.in @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +. "@datadir@/grub/grub-mkconfig_lib" CLASS="--class gnu --class os" Index: b/util/grub.d/10_kfreebsd.in =================================================================== --- a/util/grub.d/10_kfreebsd.in +++ b/util/grub.d/10_kfreebsd.in @@ -17,14 +17,13 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +. "@datadir@/grub/grub-mkconfig_lib" export TEXTDOMAIN=@PACKAGE@ -export TEXTDOMAINDIR=@localedir@ +export TEXTDOMAINDIR="@localedir@" CLASS="--class os" Index: b/util/grub.d/10_linux.in =================================================================== --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -17,14 +17,14 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" + +. "@datadir@/grub/grub-mkconfig_lib" export TEXTDOMAIN=@PACKAGE@ -export TEXTDOMAINDIR=@localedir@ +export TEXTDOMAINDIR="@localedir@" CLASS="--class gnu-linux --class gnu --class os" Index: b/util/grub.d/10_netbsd.in =================================================================== --- a/util/grub.d/10_netbsd.in +++ b/util/grub.d/10_netbsd.in @@ -17,14 +17,13 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" +. "@datadir@/grub/grub-mkconfig_lib" export TEXTDOMAIN=@PACKAGE@ -export TEXTDOMAINDIR=@localedir@ +export TEXTDOMAINDIR="@localedir@" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS="NetBSD" Index: b/util/grub.d/10_windows.in =================================================================== --- a/util/grub.d/10_windows.in +++ b/util/grub.d/10_windows.in @@ -17,10 +17,11 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" + +. "@datadir@/grub/grub-mkconfig_lib" case "`uname 2>/dev/null`" in CYGWIN*) ;; Index: b/util/grub.d/20_linux_xen.in =================================================================== --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -17,14 +17,14 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -. ${libdir}/grub/grub-mkconfig_lib +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" + +. "@datadir@/grub/grub-mkconfig_lib" export TEXTDOMAIN=@PACKAGE@ -export TEXTDOMAINDIR=@localedir@ +export TEXTDOMAINDIR="@localedir@" CLASS="--class gnu-linux --class gnu --class os --class xen" Index: b/util/grub.d/30_os-prober.in =================================================================== --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -17,11 +17,11 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" -. ${libdir}/grub/grub-mkconfig_lib +. "@datadir@/grub/grub-mkconfig_lib" if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then exit 0 Index: b/util/update-grub_lib.in =================================================================== --- a/util/update-grub_lib.in +++ b/util/update-grub_lib.in @@ -14,10 +14,10 @@ # You should have received a copy of the GNU General Public License # along with GRUB. If not, see . -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ +prefix="@prefix@" +exec_prefix="@exec_prefix@" +datarootdir="@datarootdir@" -. ${libdir}/grub/grub-mkconfig_lib +. "@datadir@/grub/grub-mkconfig_lib" grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"