4517db3592
Upgrade Gnulib files to 20190105. It's much easier to maintain GRUB's use of portability support files from Gnulib when the process is automatic and driven by a single configuration file, rather than by maintainers occasionally running gnulib-tool and committing the result. Removing these automatically-copied files from revision control also removes the temptation to hack the output in ways that are difficult for future maintainers to follow. Gnulib includes a "bootstrap" program which is designed for this. The canonical way to bootstrap GRUB from revision control is now "./bootstrap", but "./autogen.sh" is still useful if you just want to generate the GRUB-specific parts of the build system. GRUB now requires Autoconf >= 2.63 and Automake >= 1.11, in line with Gnulib. Gnulib source code is now placed in grub-core/lib/gnulib/ (which should not be edited directly), and GRUB's patches are in grub-core/lib/gnulib-patches/. I've added a few notes to the developer manual on how to maintain this. Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
103 lines
3.5 KiB
Bash
Executable file
103 lines
3.5 KiB
Bash
Executable file
#! /usr/bin/env bash
|
|
|
|
set -e
|
|
|
|
if [ ! -e grub-core/lib/gnulib/stdlib.in.h ]; then
|
|
echo "Gnulib not yet bootstrapped; run ./bootstrap instead." >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Set ${PYTHON} to plain 'python' if not set already
|
|
: ${PYTHON:=python}
|
|
|
|
export LC_COLLATE=C
|
|
unset LC_ALL
|
|
|
|
find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
|
|
find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in
|
|
|
|
echo "Importing unicode..."
|
|
${PYTHON} util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
|
|
|
|
echo "Importing libgcrypt..."
|
|
${PYTHON} util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
|
|
sed -n -f util/import_gcrypth.sed < grub-core/lib/libgcrypt/src/gcrypt.h.in > include/grub/gcrypt/gcrypt.h
|
|
if [ -f include/grub/gcrypt/g10lib.h ]; then
|
|
rm include/grub/gcrypt/g10lib.h
|
|
fi
|
|
if [ -d grub-core/lib/libgcrypt-grub/mpi/generic ]; then
|
|
rm -rf grub-core/lib/libgcrypt-grub/mpi/generic
|
|
fi
|
|
cp grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10lib.h
|
|
cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic
|
|
|
|
for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
|
|
if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ] || [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
|
|
rm grub-core/lib/libgcrypt-grub/mpi/"$x"
|
|
fi
|
|
cp grub-core/lib/libgcrypt-grub/mpi/generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
|
|
done
|
|
|
|
echo "Generating Automake input..."
|
|
|
|
# Automake doesn't like including files from a path outside the project.
|
|
rm -f contrib grub-core/contrib
|
|
if [ "x${GRUB_CONTRIB}" != x ]; then
|
|
[ "${GRUB_CONTRIB}" = contrib ] || ln -s "${GRUB_CONTRIB}" contrib
|
|
[ "${GRUB_CONTRIB}" = grub-core/contrib ] || ln -s ../contrib grub-core/contrib
|
|
fi
|
|
|
|
UTIL_DEFS='Makefile.util.def Makefile.utilgcry.def'
|
|
CORE_DEFS='grub-core/Makefile.core.def grub-core/Makefile.gcry.def'
|
|
|
|
for extra in contrib/*/Makefile.util.def; do
|
|
if test -e "$extra"; then
|
|
UTIL_DEFS="$UTIL_DEFS $extra"
|
|
fi
|
|
done
|
|
|
|
for extra in contrib/*/Makefile.core.def; do
|
|
if test -e "$extra"; then
|
|
CORE_DEFS="$CORE_DEFS $extra"
|
|
fi
|
|
done
|
|
|
|
${PYTHON} gentpl.py $UTIL_DEFS > Makefile.util.am
|
|
${PYTHON} gentpl.py $CORE_DEFS > grub-core/Makefile.core.am
|
|
|
|
for extra in contrib/*/Makefile.common; do
|
|
if test -e "$extra"; then
|
|
echo "include $extra" >> Makefile.util.am
|
|
echo "include $extra" >> grub-core/Makefile.core.am
|
|
fi
|
|
done
|
|
|
|
for extra in contrib/*/Makefile.util.common; do
|
|
if test -e "$extra"; then
|
|
echo "include $extra" >> Makefile.util.am
|
|
fi
|
|
done
|
|
|
|
for extra in contrib/*/Makefile.core.common; do
|
|
if test -e "$extra"; then
|
|
echo "include $extra" >> grub-core/Makefile.core.am
|
|
fi
|
|
done
|
|
|
|
echo "Saving timestamps..."
|
|
echo timestamp > stamp-h.in
|
|
|
|
if [ -z "$FROM_BOOTSTRAP" ]; then
|
|
# Unaided autoreconf is likely to install older versions of many files
|
|
# than the ones provided by Gnulib, but in most cases this won't matter
|
|
# very much. This mode is provided so that you can run ./autogen.sh to
|
|
# regenerate the GRUB build system in an unpacked release tarball (perhaps
|
|
# after patching it), even on systems that don't have access to
|
|
# gnulib.git.
|
|
echo "Running autoreconf..."
|
|
cp -a INSTALL INSTALL.grub
|
|
autoreconf -vif
|
|
mv INSTALL.grub INSTALL
|
|
fi
|
|
|
|
exit 0
|