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

Source grub-mkconfig_lib from the build directory at build time.

Browse source
This commit is contained in:
Grégoire Sutre 2012-02-10 18:16:27 +01:00
parent ebcecdf1c3
commit c8d9ead677
11 changed files with 54 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2012-02-10 Grégoire Sutre <gregoire.sutre@gmail.com>
Source grub-mkconfig_lib from the build directory at build time.
Suggested by: Vladimir Serbinenko.
* gentpl.py (manpage): Set pkgdatadir to $(builddir) on help2man call.
* util/grub-install.in: Define pkgdatadir if not already set, and source
grub-mkconfig_lib from there.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
Increase warning level. Increase warning level.

2
gentpl.py
View file

@ -465,7 +465,7 @@ def manpage():
r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n") r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
r += rule("[+ name +].[+ mansection +]", "[+ name +]", """ r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
chmod a+x [+ name +] chmod a+x [+ name +]
PATH=$(builddir):$$PATH $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
""") """)
r += gvar_add("CLEANFILES", "[+ name +].[+ mansection +]") r += gvar_add("CLEANFILES", "[+ name +].[+ mansection +]")
r += "endif\n" r += "endif\n"

5
util/grub-install.in
View file

@ -34,6 +34,9 @@ platform=@platform@
host_os=@host_os@ host_os=@host_os@
pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`" pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
localedir="@datadir@/locale" localedir="@datadir@/locale"
self="`basename $0`" self="`basename $0`"
@ -77,7 +80,7 @@ else
disk_module=native disk_module=native
fi fi
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

5
util/grub-kbdcomp.in
View file

@ -7,12 +7,15 @@ exec_prefix="@exec_prefix@"
bindir="@bindir@" bindir="@bindir@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`" grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`"
ckbcomp_options="" ckbcomp_options=""
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
self=`basename $0` self=`basename $0`

8
util/grub-mkconfig.in
View file

@ -31,7 +31,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@ host_os=@host_os@
datadir="@datadir@" datadir="@datadir@"
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
grub_cfg="" grub_cfg=""
grub_mkconfig_dir="${sysconfdir}"/grub.d grub_mkconfig_dir="${sysconfdir}"/grub.d
@ -42,7 +44,7 @@ grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
@ -95,8 +97,6 @@ do
esac esac
done done
. "${datadir}/@PACKAGE@/grub-mkconfig_lib"
if [ "x$EUID" = "x" ] ; then if [ "x$EUID" = "x" ] ; then
EUID=`id -u` EUID=`id -u`
fi fi

5
util/grub-mknetdir.in
View file

@ -30,6 +30,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@ host_os=@host_os@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0` self=`basename $0`
@ -52,7 +55,7 @@ efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi"
efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi" efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi"
itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi" itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi"
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

5
util/grub-mkrescue.in
View file

@ -30,6 +30,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
self=`basename $0` self=`basename $0`
@ -46,7 +49,7 @@ grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
xorriso=xorriso xorriso=xorriso
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

5
util/grub-mkstandalone.in
View file

@ -31,6 +31,9 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0` self=`basename $0`
@ -40,7 +43,7 @@ format=
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
source= source=
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

5
util/grub-reboot.in
View file

@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0` self=`basename $0`
@ -34,7 +37,7 @@ rootdir=
bootdir= bootdir=
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

5
util/grub-set-default.in
View file

@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0` self=`basename $0`
@ -34,7 +37,7 @@ rootdir=
bootdir= bootdir=
grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.

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

@ -32,12 +32,15 @@ platform=@platform@
pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
datadir="@datadir@" datadir="@datadir@"
if [ "x$pkgdatadir" = x ]; then
pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
fi
self=`basename $0` self=`basename $0`
grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
. "${datadir}/@PACKAGE@/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.