[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 0/1] Upgrade Gnulib; switch to bootstrap tool
|
From: |
Colin Watson |
|
Subject: |
[PATCH 0/1] Upgrade Gnulib; switch to bootstrap tool |
|
Date: |
Wed, 9 Jan 2019 12:29:05 +0000 |
|
User-agent: |
NeoMutt/20170113 (1.7.2) |
I have a bug report that I think is best handled by importing and using
a new module from Gnulib, so I tried to do that. Unfortunately GRUB's
Gnulib import is in a confusing state that makes it difficult to do
this. The last full update was in 2013, without documentation of the
exact commit that was imported. Since then it's been maintained by
various ad-hoc hacks and importing new modules has become difficult.
Other GNU projects use a "bootstrap" tool that's been added to Gnulib,
and I think that's the best thing to do here as well. Since GRUB's
autogen.sh does substantially more than just calling autoreconf, I've
retained it so that it can be used by downstream packages that need to
patch and regenerate GRUB's build system without reimporting Gnulib.
This patch is necessarily very large because it removes many
autogenerated files. For ease of review, here's a version of the patch
without those removals, produced by running it through this command:
filterdiff -p1 \
-x ABOUT-NLS -x build-aux/\* -x grub-core/gnulib/\* -x m4/\* \
-x po/\*
Note that the added "bootstrap" file is a verbatim copy of
gnulib/build-aux/bootstrap at the commit identified in bootstrap.conf.
diff --git a/.gitignore b/.gitignore
index eca17bec9..3ef4c0d30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
00_header
10_*
20_linux_xen
@@ -6,11 +7,13 @@
41_custom
*.1
*.8
+ABOUT-NLS
aclocal.m4
ahci_test
ascii.bitmaps
ascii.h
autom4te.cache
+build-aux
build-grub-gen-asciih
build-grub-gen-widthspec
build-grub-mkfont
@@ -42,6 +45,7 @@ gensymlist.sh
gentrigtables
gentrigtables.exe
gettext_strings_test
+/gnulib
grub-bin2h
/grub-bios-setup
/grub-bios-setup.exe
@@ -134,6 +138,7 @@ help_test
*.image.exe
include/grub/cpu
include/grub/machine
+INSTALL.grub
install-sh
lib/libgcrypt-grub
libgrub_a_init.c
@@ -142,6 +147,7 @@ libgrub_a_init.c
lzocompress_test
*.marker
Makefile
+/m4
*.mod
mod-*.c
missing
@@ -155,7 +161,11 @@ pata_test
*.pp
po/*.mo
po/grub.pot
+po/Makefile.in.in
+po/Makevars
+po/Makevars.template
po/POTFILES
+po/Rules-quot
po/stamp-po
printf_test
priority_queue_unit_test
@@ -202,25 +212,7 @@ grub-core/*.module.exe
grub-core/*.pp
grub-core/kernel.img.bin
util/bash-completion.d/grub
-grub-core/gnulib/alloca.h
-grub-core/gnulib/arg-nonnull.h
-grub-core/gnulib/c++defs.h
-grub-core/gnulib/charset.alias
-grub-core/gnulib/configmake.h
-grub-core/gnulib/float.h
-grub-core/gnulib/getopt.h
-grub-core/gnulib/langinfo.h
-grub-core/gnulib/ref-add.sed
-grub-core/gnulib/ref-del.sed
-grub-core/gnulib/stdio.h
-grub-core/gnulib/stdlib.h
-grub-core/gnulib/string.h
-grub-core/gnulib/strings.h
-grub-core/gnulib/sys
-grub-core/gnulib/unistd.h
-grub-core/gnulib/warn-on-use.h
-grub-core/gnulib/wchar.h
-grub-core/gnulib/wctype.h
+grub-core/gnulib
grub-core/rs_decoder.h
widthspec.bin
widthspec.h
@@ -242,7 +234,6 @@ po/POTFILES-shell.in
grub-core/gnulib/locale.h
grub-core/gnulib/unitypes.h
grub-core/gnulib/uniwidth.h
-build-aux/test-driver
/garbage-gen
/garbage-gen.exe
/grub-fs-tester
diff --git a/autogen.sh b/autogen.sh
index 7537561ad..38e9cdd97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,11 @@
set -e
+if [ ! -e grub-core/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}
@@ -82,6 +87,17 @@ done
echo "Saving timestamps..."
echo timestamp > stamp-h.in
-echo "Running autoreconf..."
-autoreconf -vi
+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
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 000000000..5b08e7e2d
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,1073 @@
+#! /bin/sh
+# Print a version string.
+scriptversion=2019-01-04.17; # UTC
+
+# Bootstrap this package from checked-out sources.
+
+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+# Originally written by Paul Eggert. The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project. The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to address@hidden
+
+nl='
+'
+
+# Ensure file names are sorted consistently across platforms.
+LC_ALL=C
+export LC_ALL
+
+# Ensure that CDPATH is not set. Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+local_gl_dir=gl
+
+# Honor $PERL, but work even if there is none.
+PERL="${PERL-perl}"
+
+me=$0
+
+default_gnulib_url=git://git.sv.gnu.org/gnulib
+
+usage() {
+ cat <<EOF
+Usage: $me [OPTION]...
+Bootstrap this package from the checked-out sources.
+
+Options:
+ --gnulib-srcdir=DIRNAME specify the local directory where gnulib
+ sources reside. Use this if you already
+ have gnulib sources on your machine, and
+ do not want to waste your bandwidth downloading
+ them again. Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync if this bootstrap script is not identical to
+ the version in the local gnulib sources,
+ update this script, and then restart it with
+ /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync do not check whether bootstrap is out of sync
+ --copy copy files instead of creating symbolic links
+ --force attempt to bootstrap even if the sources seem
+ not to have been checked out
+ --no-git do not use git to update gnulib. Requires that
+ --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
+contents are read as shell variables to configure the bootstrap.
+
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
+Gnulib sources can be fetched in various ways:
+
+ * If this package is in a git repository with a 'gnulib' submodule
+ configured, then that submodule is initialized and updated and sources
+ are fetched from there. If \$GNULIB_SRCDIR is set (directly or via
+ --gnulib-srcdir) and is a git repository, then it is used as a reference.
+
+ * Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
+ then sources are fetched from that local directory. If it is a git
+ repository and \$GNULIB_REVISION is set, then that revision is checked
+ out.
+
+ * Otherwise, if this package is in a git repository with a 'gnulib'
+ submodule configured, then that submodule is initialized and updated and
+ sources are fetched from there.
+
+ * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
+ cloned into that directory using git from \$GNULIB_URL, defaulting to
+ $default_gnulib_url.
+ If \$GNULIB_REVISION is set, then that revision is checked out.
+
+ * Otherwise, the existing Gnulib sources in the 'gnulib' directory are
+ used. If it is a git repository and \$GNULIB_REVISION is set, then that
+ revision is checked out.
+
+If you maintain a package and want to pin a particular revision of the
+Gnulib sources that has been tested with your package, then there are two
+possible approaches: either configure a 'gnulib' submodule with the
+appropriate revision, or set \$GNULIB_REVISION (and if necessary
+\$GNULIB_URL) in $me.conf.
+
+Running without arguments will suffice in most cases.
+EOF
+}
+
+# warnf_ FORMAT-STRING ARG1...
+warnf_ ()
+{
+ warnf_format_=$1
+ shift
+ nl='
+'
+ case $* in
+ *$nl*) me_=$(printf "$me"|tr "$nl|" '??')
+ printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
+ *) printf "$me: $warnf_format_" "$@" ;;
+ esac >&2
+}
+
+# warn_ WORD1...
+warn_ ()
+{
+ # If IFS does not start with ' ', set it and emit the warning in a subshell.
+ case $IFS in
+ ' '*) warnf_ '%s\n' "$*";;
+ *) (IFS=' '; warn_ "$@");;
+ esac
+}
+
+# die WORD1...
+die() { warn_ "$@"; exit 1; }
+
+# Configuration.
+
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
+# List of gnulib modules needed.
+gnulib_modules=
+
+# Any gnulib files needed that are not in modules.
+gnulib_files=
+
+: ${AUTOPOINT=autopoint}
+: ${AUTORECONF=autoreconf}
+
+# A function to be called right after gnulib-tool is run.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_post_import_hook() { :; }
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
+# The command to download all .po files for a specified domain into a
+# specified directory. Fill in the first %s with the destination
+# directory and the second with the domain name.
+po_download_command_format=\
+"wget --mirror --level=1 -nd -q -A.po -P '%s' \
+ https://translationproject.org/latest/%s/";
+
+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
+extract_package_name='
+ /^AC_INIT(\[*/{
+ s///
+ /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+ s//\1/
+ s/[],)].*//
+ p
+ q
+ }
+ s/[],)].*//
+ s/^GNU //
+ y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
+ p
+ }
+'
+package=$(sed -n "$extract_package_name" configure.ac) \
+ || die 'cannot find package name in configure.ac'
+gnulib_name=lib$package
+
+build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+gnulib_extra_files="
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
+ doc/INSTALL
+"
+
+# Additional gnulib-tool options to use. Use "\newline" to break lines.
+gnulib_tool_option_extras=
+
+# Other locale categories that need message catalogs.
+EXTRA_LOCALE_CATEGORIES=
+
+# Additional xgettext options to use. Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS='\\\
+ --flag=_:1:pass-c-format\\\
+ --flag=N_:1:pass-c-format\\\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
+'
+
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
address@hidden
+
+# Files we don't want to import.
+excluded_files=
+
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=README-hacking
+
+# Whether to use copies instead of symlinks.
+copy=false
+
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
+check_exists() {
+ if test "$1" = "--verbose"; then
+ ($2 --version </dev/null) >/dev/null 2>&1
+ if test $? -ge 126; then
+ # If not found, run with diagnostics as one may be
+ # presented with env variables to set to find the right version
+ ($2 --version </dev/null)
+ fi
+ else
+ ($1 --version </dev/null) >/dev/null 2>&1
+ fi
+
+ test $? -lt 126
+}
+
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program. Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run.
+# If found, set ENVVAR to the program name, die otherwise.
+#
+# FIXME: code duplication, see also gnu-web-doc-update.
+find_tool ()
+{
+ find_tool_envvar=$1
+ shift
+ find_tool_names=$@
+ eval "find_tool_res=\$$find_tool_envvar"
+ if test x"$find_tool_res" = x; then
+ for i; do
+ if check_exists $i; then
+ find_tool_res=$i
+ break
+ fi
+ done
+ fi
+ if test x"$find_tool_res" = x; then
+ warn_ "one of these is required: $find_tool_names;"
+ die "alternatively set $find_tool_envvar to a compatible tool"
+ fi
+ eval "$find_tool_envvar=\$find_tool_res"
+ eval "export $find_tool_envvar"
+}
+
+# Override the default configuration, if necessary.
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+ */*) test -r "$0.conf" && . "$0.conf" ;;
+ *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+if test "$vc_ignore" = auto; then
+ vc_ignore=
+ test -d .git && vc_ignore=.gitignore
+ test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
+if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then
+ use_gnulib=false
+else
+ use_gnulib=true
+fi
+
+# Translate configuration into internal form.
+
+# Parse options.
+
+for option
+do
+ case $option in
+ --help)
+ usage
+ exit;;
+ --gnulib-srcdir=*)
+ GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
+ --skip-po)
+ SKIP_PO=t;;
+ --force)
+ checkout_only_file=;;
+ --copy)
+ copy=true;;
+ --bootstrap-sync)
+ bootstrap_sync=true;;
+ --no-bootstrap-sync)
+ bootstrap_sync=false;;
+ --no-git)
+ use_git=false;;
+ *)
+ die "$option: unknown option";;
+ esac
+done
+
+$use_git || test -d "$GNULIB_SRCDIR" \
+ || die "Error: --no-git requires --gnulib-srcdir"
+
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+ die "Bootstrapping from a non-checked-out distribution is risky."
+fi
+
+# Strip blank and comment lines to leave significant entries.
+gitignore_entries() {
+ sed '/^#/d; /^$/d' "$@"
+}
+
+# If $STR is not already on a line by itself in $FILE, insert it at the start.
+# Entries are inserted at the start of the ignore list to ensure existing
+# entries starting with ! are not overridden. Such entries support
+# whitelisting exceptions after a more generic blacklist pattern.
+insert_if_absent() {
+ file=$1
+ str=$2
+ test -f $file || touch $file
+ test -r $file || die "Error: failed to read ignore file: $file"
+ duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
+ if [ "$duplicate_entries" ] ; then
+ die "Error: Duplicate entries in $file: " $duplicate_entries
+ fi
+ linesold=$(gitignore_entries $file | wc -l)
+ linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc
-l)
+ if [ $linesold != $linesnew ] ; then
+ { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
+ || die "insert_if_absent $file $str: failed"
+ fi
+}
+
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_if_absent.
+insert_vc_ignore() {
+ vc_ignore_file="$1"
+ pattern="$2"
+ case $vc_ignore_file in
+ *.gitignore)
+ # A .gitignore entry that does not start with '/' applies
+ # recursively to subdirectories, so prepend '/' to every
+ # .gitignore entry.
+ pattern=$(echo "$pattern" | sed s,^,/,);;
+ esac
+ insert_if_absent "$vc_ignore_file" "$pattern"
+}
+
+# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+found_aux_dir=no
+grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+ >/dev/null && found_aux_dir=yes
+grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+ >/dev/null && found_aux_dir=yes
+test $found_aux_dir = yes \
+ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
+
+# If $build_aux doesn't exist, create it now, otherwise some bits
+# below will malfunction. If creating it, also mark it as ignored.
+if test ! -d $build_aux; then
+ mkdir $build_aux
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ insert_vc_ignore $dot_ig $build_aux
+ done
+fi
+
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+ ver1="$1"
+ ver2="$2"
+
+ # split on '.' and compare each component
+ i=1
+ while : ; do
+ p1=$(echo "$ver1" | cut -d. -f$i)
+ p2=$(echo "$ver2" | cut -d. -f$i)
+ if [ ! "$p1" ]; then
+ echo "$1 $2"
+ break
+ elif [ ! "$p2" ]; then
+ echo "$2 $1"
+ break
+ elif [ ! "$p1" = "$p2" ]; then
+ if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+ echo "$2 $1"
+ elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+ echo "$1 $2"
+ else # numeric, then lexicographic comparison
+ lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+ if [ "$lp" = "$p2" ]; then
+ echo "$1 $2"
+ else
+ echo "$2 $1"
+ fi
+ fi
+ break
+ fi
+ i=$(($i+1))
+ done
+}
+
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
+
+# Skip lines that do not start with version.
+/^[0-9]/!d
+
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
+
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
+
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
+
+get_version() {
+ app=$1
+
+ $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+
+ $app --version 2>&1 | sed -n "$get_version_sed"
+}
+
+check_versions() {
+ ret=0
+
+ while read app req_ver; do
+ # We only need libtoolize from the libtool package.
+ if test "$app" = libtool; then
+ app=libtoolize
+ fi
+ # Exempt git if --no-git is in effect.
+ if test "$app" = git; then
+ $use_git || continue
+ fi
+ # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+ appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_')
+ test "$appvar" = TAR && appvar=AMTAR
+ case $appvar in
+ GZIP) ;; # Do not use $GZIP: it contains gzip options.
+ PERL::*) ;; # Keep perl modules as-is
+ *) eval "app=\${$appvar-$app}" ;;
+ esac
+
+ # Handle the still-experimental Automake-NG programs specially.
+ # They remain named as the mainstream Automake programs ("automake",
+ # and "aclocal") to avoid gratuitous incompatibilities with
+ # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # scripts), but correctly identify themselves (as being part of
+ # "GNU automake-ng") when asked their version.
+ case $app in
+ automake-ng|aclocal-ng)
+ app=${app%-ng}
+ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
+ warn_ "Error: '$app' not found or not from Automake-NG"
+ ret=1
+ continue
+ } ;;
+ # Another check is for perl modules. These can be written as
+ # e.g. perl::XML::XPath in case of XML::XPath module, etc.
+ perl::*)
+ # Extract module name
+ app="${app#perl::}"
+ if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
+ warn_ "Error: perl module '$app' not found"
+ ret=1
+ fi
+ continue
+ ;;
+ esac
+ if [ "$req_ver" = "-" ]; then
+ # Merely require app to exist; not all prereq apps are well-behaved
+ # so we have to rely on $? rather than get_version.
+ if ! check_exists --verbose $app; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ fi
+ else
+ # Require app to produce a new enough version string.
+ inst_ver=$(get_version $app)
+ if [ ! "$inst_ver" ]; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ else
+ latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+ if [ ! "$latest_ver" = "$inst_ver" ]; then
+ warnf_ '%s\n' \
+ "Error: '$app' version == $inst_ver is too old" \
+ " '$app' version >= $req_ver is required"
+ ret=1
+ fi
+ fi
+ fi
+ done
+
+ return $ret
+}
+
+print_versions() {
+ echo "Program Min_version"
+ echo "----------------------"
+ printf %s "$buildreq"
+ echo "----------------------"
+ # can't depend on column -t
+}
+
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+ find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+ && use_libtool=1
+grep '^[ ]*LT_INIT' configure.ac >/dev/null \
+ && use_libtool=1
+if test $use_libtool = 1; then
+ find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
+case $buildreq in
+ *automake*) ;;
+ *) buildreq="automake 1.9
+$buildreq" ;;
+esac
+case $buildreq in
+ *autoconf*) ;;
+ *) buildreq="autoconf 2.59
+$buildreq" ;;
+esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
+if test -d "$local_gl_dir" \
+ && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then
+ case $buildreq in
+ *patch*) ;;
+ *) buildreq="patch -
+$buildreq" ;;
+ esac
+fi
+
+if ! printf "$buildreq" | check_versions; then
+ echo >&2
+ if test -f README-prereq; then
+ die "See README-prereq for how to get the prerequisite programs"
+ else
+ die "Please install the prerequisite programs"
+ fi
+fi
+
+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+ warn_ "WARNING: your autom4te wrapper eats stdin;"
+ warn_ "if bootstrap fails, consider upgrading your autotools"
+fi
+
+echo "$0: Bootstrapping from checked-out $package sources..."
+
+# See if we can use gnulib's git-merge-changelog merge driver.
+if $use_git && test -d .git && check_exists git; then
+ if git config merge.merge-changelog.driver >/dev/null ; then
+ :
+ elif check_exists git-merge-changelog; then
+ echo "$0: initializing git-merge-changelog driver"
+ git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ else
+ echo "$0: consider installing git-merge-changelog from gnulib"
+ fi
+fi
+
+
+cleanup_gnulib() {
+ status=$?
+ rm -fr "$gnulib_path"
+ exit $status
+}
+
+git_modules_config () {
+ test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+if $use_gnulib; then
+ if $use_git; then
+ gnulib_path=$(git_modules_config submodule.gnulib.path)
+ test -z "$gnulib_path" && gnulib_path=gnulib
+ fi
+
+ # Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
+ # submodule, for use in the rest of the script.
+
+ case ${GNULIB_SRCDIR--} in
+ -)
+ # Note that $use_git is necessarily true in this case.
+ if git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ git submodule init -- "$gnulib_path" || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
+
+ elif [ ! -d "$gnulib_path" ]; then
+ echo "$0: getting gnulib files..."
+
+ trap cleanup_gnulib 1 2 13 15
+
+ shallow=
+ if test -z "$GNULIB_REVISION"; then
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ fi
+ git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
+ || cleanup_gnulib
+
+ trap - 1 2 13 15
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ ;;
+ *)
+ # Use GNULIB_SRCDIR directly or as a reference.
+ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
+ git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ if git submodule -h|grep -- --reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
+ "$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update -- "$gnulib_path" || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init -- "$gnulib_path" \
+ && git submodule update -- "$gnulib_path" \
+ || exit $?
+ fi
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ fi
+ ;;
+ esac
+
+ if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
+ && ! git_modules_config submodule.gnulib.url >/dev/null; then
+ (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
+ fi
+
+ # $GNULIB_SRCDIR now points to the version of gnulib to use, and
+ # we no longer need to use git or $gnulib_path below here.
+
+ if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ case $(sh -c 'echo "$1"' -- a) in
+ a) ignored=--;;
+ *) ignored=ignored;;
+ esac
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+ fi
+
+ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+ <$gnulib_tool || exit $?
+fi
+
+# Get translations.
+
+download_po_files() {
+ subdir=$1
+ domain=$2
+ echo "$me: getting translations into $subdir for $domain..."
+ cmd=$(printf "$po_download_command_format" "$subdir" "$domain")
+ eval "$cmd"
+}
+
+# Mirror .po files to $po_dir/.reference and copy only the new
+# or modified ones into $po_dir. Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
+update_po_files() {
+ # Directory containing primary .po files.
+ # Overwrite them only when we're sure a .po file is new.
+ po_dir=$1
+ domain=$2
+
+ # Mirror *.po files into this dir.
+ # Usually contains *.s1 checksum files.
+ ref_po_dir="$po_dir/.reference"
+
+ test -d $ref_po_dir || mkdir $ref_po_dir || return
+ download_po_files $ref_po_dir $domain \
+ && ls "$ref_po_dir"/*.po 2>/dev/null |
+ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
+
+ langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g')
+ test "$langs" = '*' && langs=x
+ for po in $langs; do
+ case $po in x) continue;; esac
+ new_po="$ref_po_dir/$po.po"
+ cksum_file="$ref_po_dir/$po.s1"
+ if ! test -f "$cksum_file" ||
+ ! test -f "$po_dir/$po.po" ||
+ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
+ echo "$me: updated $po_dir/$po.po..."
+ cp "$new_po" "$po_dir/$po.po" \
+ && $SHA1SUM < "$new_po" > "$cksum_file" || return
+ fi
+ done
+}
+
+case $SKIP_PO in
+'')
+ if test -d po; then
+ update_po_files po $package || exit
+ fi
+
+ if test -d runtime-po; then
+ update_po_files runtime-po $package-runtime || exit
+ fi;;
+esac
+
+symlink_to_dir()
+{
+ src=$1/$2
+ dst=${3-$2}
+
+ test -f "$src" && {
+
+ # If the destination directory doesn't exist, create it.
+ # This is required at least for "lib/uniwidth/cjk.h".
+ dst_dir=$(dirname "$dst")
+ if ! test -d "$dst_dir"; then
+ mkdir -p "$dst_dir"
+
+ # If we've just created a directory like lib/uniwidth,
+ # tell version control system(s) it's ignorable.
+ # FIXME: for now, this does only one level
+ parent=$(dirname "$dst_dir")
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore $ig "${dst_dir##*/}"
+ done
+ fi
+
+ if $copy; then
+ {
+ test ! -h "$dst" || {
+ echo "$me: rm -f $dst" &&
+ rm -f "$dst"
+ }
+ } &&
+ test -f "$dst" &&
+ cmp -s "$src" "$dst" || {
+ echo "$me: cp -fp $src $dst" &&
+ cp -fp "$src" "$dst"
+ }
+ else
+ # Leave any existing symlink alone, if it already points to the source,
+ # so that broken build tools that care about symlink times
+ # aren't confused into doing unnecessary builds. Conversely, if the
+ # existing symlink's timestamp is older than the source, make it afresh,
+ # so that broken tools aren't confused into skipping needed builds. See
+ # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>.
+ test -h "$dst" &&
+ src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
+ dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
+ test "$src_i" = "$dst_i" &&
+ both_ls=$(ls -dt "$src" "$dst") &&
+ test "X$both_ls" = "X$dst$nl$src" || {
+ dot_dots=
+ case $src in
+ /*) ;;
+ *)
+ case /$dst/ in
+ *//* | */../* | */./* | /*/*/*/*/*/)
+ die "invalid symlink calculation: $src -> $dst";;
+ /*/*/*/*/) dot_dots=../../../;;
+ /*/*/*/) dot_dots=../../;;
+ /*/*/) dot_dots=../;;
+ esac;;
+ esac
+
+ echo "$me: ln -fs $dot_dots$src $dst" &&
+ ln -fs "$dot_dots$src" "$dst"
+ }
+ fi
+ }
+}
+
+version_controlled_file() {
+ parent=$1
+ file=$2
+ if test -d .git; then
+ git rm -n "$file" > /dev/null 2>&1
+ elif test -d .svn; then
+ svn log -r HEAD "$file" > /dev/null 2>&1
+ elif test -d CVS; then
+ grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
+ grep '^/[^/]*/[0-9]' > /dev/null
+ else
+ warn_ "no version control for $file?"
+ false
+ fi
+}
+
+# NOTE: we have to be careful to run both autopoint and libtoolize
+# before gnulib-tool, since gnulib-tool is likely to provide newer
+# versions of files "installed" by these two programs.
+# Then, *after* gnulib-tool (see below), we have to be careful to
+# run autoreconf in such a way that it does not run either of these
+# two just-pre-run programs.
+
+# Import from gettext.
+with_gettext=yes
+grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
+
+if test $with_gettext = yes || test $use_libtool = 1; then
+
+ tempbase=.bootstrap$$
+ trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
+
+ > $tempbase.0 > $tempbase.1 &&
+ find . ! -type d -print | sort > $tempbase.0 || exit
+
+ if test $with_gettext = yes; then
+ # Released autopoint has the tendency to install macros that have been
+ # obsoleted in current gnulib, so run this before gnulib-tool.
+ echo "$0: $AUTOPOINT --force"
+ $AUTOPOINT --force || exit
+ fi
+
+ # Autoreconf runs aclocal before libtoolize, which causes spurious
+ # warnings if the initial aclocal is confused by the libtoolized
+ # (or worse out-of-date) macro directory.
+ # libtoolize 1.9b added the --install option; but we support back
+ # to libtoolize 1.5.22, where the install action was default.
+ if test $use_libtool = 1; then
+ install=
+ case $($LIBTOOLIZE --help) in
+ *--install*) install=--install ;;
+ esac
+ echo "running: $LIBTOOLIZE $install --copy"
+ $LIBTOOLIZE $install --copy
+ fi
+
+ find . ! -type d -print | sort >$tempbase.1
+ old_IFS=$IFS
+ IFS=$nl
+ for file in $(comm -13 $tempbase.0 $tempbase.1); do
+ IFS=$old_IFS
+ parent=${file%/*}
+ version_controlled_file "$parent" "$file" || {
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore "$ig" "${file##*/}"
+ done
+ }
+ done
+ IFS=$old_IFS
+
+ rm -f $tempbase.0 $tempbase.1
+ trap - 1 2 13 15
+fi
+
+# Import from gnulib.
+
+if $use_gnulib; then
+ gnulib_tool_options="\
+ --no-changelog\
+ --aux-dir=$build_aux\
+ --doc-base=$doc_base\
+ --lib=$gnulib_name\
+ --m4-base=$m4_base/\
+ --source-base=$source_base/\
+ --tests-base=$tests_base\
+ --local-dir=$local_gl_dir\
+ $gnulib_tool_option_extras\
+ "
+ if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+ fi
+ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+ $gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
+
+ for file in $gnulib_files; do
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || die "failed to symlink $file"
+ done
+fi
+
+bootstrap_post_import_hook \
+ || die "bootstrap_post_import_hook failed"
+
+# Don't proceed if there are uninitialized submodules. In particular,
+# the next step will remove dangling links, which might be links into
+# uninitialized submodules.
+#
+# Uninitialized submodules are listed with an initial dash.
+if $use_git && git submodule | grep '^-' >/dev/null; then
+ die "some git submodules are not initialized. " \
+ "Run 'git submodule init' and bootstrap again."
+fi
+
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
+# The following requires GNU find 4.2.3 or newer. Considering the usual
+# portability constraints of this script, that may seem a very demanding
+# requirement, but it should be ok. Ignore any failure, which is fine,
+# since this is only a convenience to help developers avoid the relatively
+# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+# between successive runs of this script.
+find "$m4_base" "$source_base" \
+ -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+ -type l -xtype l -delete > /dev/null 2>&1
+
+# Invoke autoreconf with --force --install to ensure upgrades of tools
+# such as ylwrap.
+AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+
+# Some systems (RHEL 5) are using ancient autotools, for which the
+# --no-recursive option had not been invented. Detect that lack and
+# omit the option when it's not supported. FIXME in 2017: remove this
+# hack when RHEL 5 autotools are updated, or when they become irrelevant.
+case $($AUTORECONF --help) in
+ *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
+esac
+
+# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
+ || die "autoreconf failed"
+
+# Get some extra files from gnulib, overriding existing files.
+for file in $gnulib_extra_files; do
+ case $file in
+ */INSTALL) dst=INSTALL;;
+ build-aux/*) dst=$build_aux/${file#build-aux/};;
+ *) dst=$file;;
+ esac
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || die "failed to symlink $file"
+done
+
+if test $with_gettext = yes; then
+ # Create gettext configuration.
+ echo "$0: Creating po/Makevars from po/Makevars.template ..."
+ rm -f po/Makevars
+ sed '
+ /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+ /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+ /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+ }
+ ' po/Makevars.template >po/Makevars \
+ || die 'cannot generate po/Makevars'
+
+ # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+ # If only the 'gettext-h' module is in use, assume autopoint already
+ # put the correct version of this file into place.
+ case $gnulib_modules in
+ *gettext-h*) ;;
+ *gettext*)
+ cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
+ || die "cannot create po/Makefile.in.in"
+ ;;
+ esac
+
+ if test -d runtime-po; then
+ # Similarly for runtime-po/Makevars, but not quite the same.
+ rm -f runtime-po/Makevars
+ sed '
+ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+ /^subdir *=.*/s/=.*/= runtime-po/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ }
+ ' po/Makevars.template >runtime-po/Makevars \
+ || die 'cannot generate runtime-po/Makevars'
+
+ # Copy identical files from po to runtime-po.
+ (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ fi
+fi
+
+bootstrap_epilogue
+
+echo "$0: done. Now you can run './configure'."
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 000000000..eb6e844d5
--- /dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,89 @@
+# Bootstrap configuration.
+
+# Copyright (C) 2006-2019 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+
+# gnulib modules used by this package.
+# mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
+# directly.
+gnulib_modules="
+ argp
+ error
+ fnmatch
+ getdelim
+ getline
+ gettext-h
+ gitlog-to-changelog
+ mbswidth
+ progname
+ realloc-gnu
+ regex
+"
+
+gnulib_tool_option_extras="\
+ --no-conditional-dependencies \
+ --no-vc-files \
+"
+
+gnulib_name=libgnu
+source_base=grub-core/gnulib
+gnulib_extra_files="
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
+"
+
+# Additional xgettext options to use. Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --from-code=UTF-8\\\
+'
+
+checkout_only_file=
+copy=true
+vc_ignore=
+
+SKIP_PO=t
+
+# Build prerequisites
+buildreq="\
+autoconf 2.63
+automake 1.11
+gettext 0.18.3
+git 1.5.5
+tar -
+"
+
+# bootstrap doesn't give us a reasonable way to stop Automake from
+# overwriting this, so we just copy our version aside and put it back later.
+cp -a INSTALL INSTALL.grub
+
+bootstrap_post_import_hook () {
+ set -e
+ for patchname in fix-null-deref fix-width no-abort; do
+ patch -d grub-core/gnulib -p2 < "grub-core/gnulib-$patchname.diff"
+ done
+ FROM_BOOTSTRAP=1 ./autogen.sh
+ set +e # bootstrap expects this
+}
+
+bootstrap_epilogue () {
+ mv INSTALL.grub INSTALL
+}
diff --git a/conf/Makefile.common b/conf/Makefile.common
index f761f7224..8f5c756f1 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -133,6 +133,6 @@ $(top_srcdir)/Makefile.util.am: $(top_srcdir)/gentpl.py
$(top_srcdir)/Makefile.u
.PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/gentpl.py
$(top_srcdir)/grub-core/Makefile.core.def
$(top_srcdir)/grub-core/Makefile.gcry.def
- if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh
manually." >&2; exit 1; fi
+ if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./bootstrap
manually." >&2; exit 1; fi
$(PYTHON) $^ > address@hidden || (rm -f address@hidden; exit 1)
mv address@hidden $@
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index b16bd9253..7f37ea63a 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -31,7 +31,6 @@ EXTRA_DIST += grub-core/genemuinitheader.sh
EXTRA_DIST += grub-core/gnulib-fix-null-deref.diff
EXTRA_DIST += grub-core/gnulib-fix-width.diff
EXTRA_DIST += grub-core/gnulib-no-abort.diff
-EXTRA_DIST += grub-core/gnulib-no-gets.diff
EXTRA_DIST += grub-core/lib/libgcrypt
EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
diff --git a/configure.ac b/configure.ac
index 81a19afd5..c1955542a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,8 @@ save_program_prefix="${program_prefix}"
AC_CANONICAL_TARGET
program_prefix="${save_program_prefix}"
-AM_INIT_AUTOMAKE([1.10.1])
-AC_PREREQ(2.60)
+AM_INIT_AUTOMAKE([1.11])
+AC_PREREQ(2.63)
AC_CONFIG_SRCDIR([include/grub/dl.h])
AC_CONFIG_HEADER([config-util.h])
@@ -352,6 +352,7 @@ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
AC_GNU_SOURCE
AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.3])
AC_SYS_LARGEFILE
# Identify characteristics of the host architecture.
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
index ca40874e5..4b43a8293 100644
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -672,7 +672,7 @@ is already present and you'll need to make it follow the
existant code paths
for your platform adding adjustments if necessary. When done compile:
@example
-./autogen.sh
+./bootstrap
./configure --target=$cpu --with-platform=$platform TARGET_CC=.. OBJCOPY=...
STRIP=...
make > /dev/null
@end example
diff --git a/grub-core/gnulib-fix-gcc7-fallthrough.diff
b/grub-core/gnulib-fix-gcc7-fallthrough.diff
deleted file mode 100644
index 9802e2d24..000000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git grub-core/gnulib/regexec.c grub-core/gnulib/regexec.c
-index f632cd4..a7776f0 100644
---- grub-core/gnulib/regexec.c
-+++ grub-core/gnulib/regexec.c
-@@ -4099,6 +4099,9 @@ check_node_accept (const re_match_context_t *mctx, const
re_token_t *node,
- case OP_UTF8_PERIOD:
- if (ch >= ASCII_CHARS)
- return false;
-+#if defined __GNUC__ && __GNUC__ >= 7
-+ __attribute__ ((fallthrough));
-+#endif
- /* FALLTHROUGH */
- #endif
- case OP_PERIOD:
diff --git a/grub-core/gnulib-fix-null-deref.diff
b/grub-core/gnulib-fix-null-deref.diff
index a2fba8c3b..8fafa153a 100644
--- a/grub-core/gnulib-fix-null-deref.diff
+++ b/grub-core/gnulib-fix-null-deref.diff
@@ -1,7 +1,8 @@
-=== modified file 'grub-core/gnulib/argp-parse.c'
---- grub-core/gnulib/argp-parse.c 2010-04-02 22:45:01 +0000
-+++ grub-core/gnulib/argp-parse.c 2011-04-10 13:25:52 +0000
-@@ -935,7 +935,7 @@
+diff --git a/lib/argp-parse.c b/lib/argp-parse.c
+index 6dec57310..900adad54 100644
+--- a/lib/argp-parse.c
++++ b/lib/argp-parse.c
+@@ -940,7 +940,7 @@ weak_alias (__argp_parse, argp_parse)
void *
__argp_input (const struct argp *argp, const struct argp_state *state)
{
@@ -10,4 +11,3 @@
{
struct group *group;
struct parser *parser = state->pstate;
-
diff --git a/grub-core/gnulib-fix-width.diff b/grub-core/gnulib-fix-width.diff
index ae77af6c9..0a208ad08 100644
--- a/grub-core/gnulib-fix-width.diff
+++ b/grub-core/gnulib-fix-width.diff
@@ -1,8 +1,8 @@
diff --git a/lib/argp-fmtstream.c b/lib/argp-fmtstream.c
-index 7aa317c..02406ff 100644
+index ba6a407f7..d0685b3d4 100644
--- a/lib/argp-fmtstream.c
+++ b/lib/argp-fmtstream.c
-@@ -29,9 +29,11 @@
+@@ -28,9 +28,11 @@
#include <errno.h>
#include <stdarg.h>
#include <ctype.h>
@@ -14,7 +14,7 @@ index 7aa317c..02406ff 100644
#ifndef ARGP_FMTSTREAM_USE_LINEWRAP
-@@ -116,6 +118,51 @@ weak_alias (__argp_fmtstream_free, argp_fmtstream_free)
+@@ -115,6 +117,51 @@ weak_alias (__argp_fmtstream_free, argp_fmtstream_free)
#endif
#endif
@@ -66,12 +66,12 @@ index 7aa317c..02406ff 100644
/* Process FS's buffer so that line wrapping is done from POINT_OFFS to the
end of its buffer. This code is mostly from glibc stdio/linewrap.c. */
void
-@@ -168,14 +215,15 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
-
+@@ -168,13 +215,15 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
if (!nl)
{
-+ size_t display_width = mbsnwidth (buf, fs->p - buf, MBSW_STOP_AT_NUL);
/* The buffer ends in a partial line. */
++ size_t display_width = mbsnwidth (buf, fs->p - buf,
++ MBSW_STOP_AT_NUL);
- if (fs->point_col + len < fs->rmargin)
+ if (fs->point_col + display_width < fs->rmargin)
@@ -84,7 +84,7 @@ index 7aa317c..02406ff 100644
break;
}
else
-@@ -183,14 +231,18 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+@@ -182,14 +231,18 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
the end of the buffer. */
nl = fs->p;
}
@@ -111,16 +111,16 @@ index 7aa317c..02406ff 100644
/* This line is too long. */
r = fs->rmargin - 1;
-@@ -226,7 +278,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+@@ -225,7 +278,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
char *p, *nextline;
int i;
- p = buf + (r + 1 - fs->point_col);
-+ p = buf + add_width (buf, fs->p, (r + 1 - fs->point_col));
++ p = buf + add_width (buf, fs->p, (r + 1 - fs->point_col));
while (p >= buf && !isblank ((unsigned char) *p))
--p;
nextline = p + 1; /* This will begin the next line. */
-@@ -244,7 +296,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+@@ -243,7 +296,7 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
{
/* A single word that is greater than the maximum line width.
Oh well. Put it on an overlong line by itself. */
@@ -129,21 +129,21 @@ index 7aa317c..02406ff 100644
/* Find the end of the long word. */
if (p < nl)
do
-@@ -278,7 +330,8 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+@@ -277,7 +330,8 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
&& fs->p > nextline)
{
/* The margin needs more blanks than we removed. */
- if (fs->end - fs->p > fs->wmargin + 1)
+ if (mbsnwidth (fs->p, fs->end - fs->p, MBSW_STOP_AT_NUL)
-+ > fs->wmargin + 1)
++ > fs->wmargin + 1)
/* Make some space for them. */
{
size_t mv = fs->p - nextline;
diff --git a/lib/argp-help.c b/lib/argp-help.c
-index 354f1e2..2914f47 100644
+index e5375a0f0..5d8f451ec 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
-@@ -50,6 +50,7 @@
+@@ -51,6 +51,7 @@
#include "argp.h"
#include "argp-fmtstream.h"
#include "argp-namefrob.h"
@@ -151,7 +151,7 @@ index 354f1e2..2914f47 100644
#ifndef SIZE_MAX
# define SIZE_MAX ((size_t) -1)
-@@ -1452,7 +1453,7 @@ argp_args_usage (const struct argp *argp, const struct
argp_state *state,
+@@ -1432,7 +1433,7 @@ argp_args_usage (const struct argp *argp, const struct
argp_state *state,
/* Manually do line wrapping so that it (probably) won't get wrapped at
any embedded spaces. */
@@ -161,71 +161,57 @@ index 354f1e2..2914f47 100644
__argp_fmtstream_write (stream, cp, nl - cp);
}
diff --git a/lib/mbswidth.c b/lib/mbswidth.c
-index 7c2dfce..baa4f27 100644
+index 408a15e34..b3fb7f83a 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
-@@ -90,6 +90,9 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
+@@ -38,6 +38,14 @@
+ /* Get INT_MAX. */
+ #include <limits.h>
+
++#ifndef FALLTHROUGH
++# if __GNUC__ < 7
++# define FALLTHROUGH ((void) 0)
++# else
++# define FALLTHROUGH __attribute__ ((__fallthrough__))
++# endif
++#endif
++
+ /* Returns the number of columns needed to represent the multibyte
+ character string pointed to by STRING. If a non-printable character
+ occurs, and MBSW_REJECT_UNPRINTABLE is specified, -1 is returned.
+@@ -90,6 +98,10 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
p++;
width++;
break;
-+ case '\0':
-+ if (flags & MBSW_STOP_AT_NUL)
-+ return width;
++ case '\0':
++ if (flags & MBSW_STOP_AT_NUL)
++ return width;
++ FALLTHROUGH;
default:
/* If we have a multibyte sequence, scan it up to its end. */
{
-@@ -168,6 +171,9 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
+@@ -168,6 +180,9 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
{
unsigned char c = (unsigned char) *p++;
+ if (c == 0 && (flags & MBSW_STOP_AT_NUL))
-+ return width;
++ return width;
+
if (isprint (c))
{
if (width == INT_MAX)
diff --git a/lib/mbswidth.h b/lib/mbswidth.h
-index e9c0b03..d7207c5 100644
+index 2b5c53c37..45a123e63 100644
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
-@@ -45,6 +45,9 @@ extern "C" {
+@@ -45,6 +45,10 @@ extern "C" {
control characters and 1 otherwise. */
#define MBSW_REJECT_UNPRINTABLE 2
+/* If this bit is set \0 is treated as the end of string.
+ Otherwise it's treated as a normal one column width character. */
+#define MBSW_STOP_AT_NUL 4
++
/* Returns the number of screen columns needed for STRING. */
#define mbswidth gnu_mbswidth /* avoid clash with UnixWare 7.1.1 function */
-diff --git a/modules/argp b/modules/argp
-index 125046a..6f14d10 100644
---- a/modules/argp
-+++ b/modules/argp
-@@ -40,6 +40,7 @@ stdalign
- strerror
- memchr
- memmove
-+mbswidth
-
- configure.ac:
- gl_ARGP
-diff --git a/modules/argp-tests b/modules/argp-tests
-index 8f92a4d..0463927 100644
---- a/modules/argp-tests
-+++ b/modules/argp-tests
-@@ -1,11 +1,13 @@
- Files:
- tests/test-argp.c
- tests/test-argp-2.sh
-+tests/test-argp-2-utf.sh
-
- Depends-on:
- progname
-
- Makefile.am:
- TESTS += test-argp test-argp-2.sh
--check_PROGRAMS += test-argp
-+TESTS += test-argp test-argp-2.sh test-argp-2-utf.sh
-+check_PROGRAMS += test-argp test-argp-utf8
- test_argp_LDADD = $(LDADD) @LIBINTL@
diff --git a/grub-core/gnulib-no-abort.diff b/grub-core/gnulib-no-abort.diff
index 8377338f7..e469c4762 100644
--- a/grub-core/gnulib-no-abort.diff
+++ b/grub-core/gnulib-no-abort.diff
@@ -1,14 +1,11 @@
-=== modified file 'grub-core/gnulib/regcomp.c'
---- grub-core/gnulib/regcomp.c 2010-09-20 10:35:33 +0000
-+++ grub-core/gnulib/regcomp.c 2012-03-10 11:31:42 +0000
-@@ -549,13 +549,9 @@ regerror (int errcode, const regex_t *_R
- if (BE (errcode < 0
- || errcode >= (int) (sizeof (__re_error_msgid_idx)
- / sizeof (__re_error_msgid_idx[0])), 0))
-- /* Only error codes returned by the rest of the code should be passed
-- to this routine. If we are given anything else, or if other regex
-- code generates an invalid error code, then the program has a bug.
-- Dump core so we can fix it. */
+diff --git a/lib/regcomp.c b/lib/regcomp.c
+index cc85f35ac..de45ebb5c 100644
+--- a/lib/regcomp.c
++++ b/lib/regcomp.c
+@@ -528,9 +528,9 @@ regerror (int errcode, const regex_t *__restrict preg,
char *__restrict errbuf,
+ to this routine. If we are given anything else, or if other regex
+ code generates an invalid error code, then the program has a bug.
+ Dump core so we can fix it. */
- abort ();
-
- msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
@@ -17,8 +14,8 @@
+ msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
msg_size = strlen (msg) + 1; /* Includes the null. */
-
-@@ -1119,7 +1119,7 @@
+
+@@ -1136,7 +1136,7 @@ optimize_utf8 (re_dfa_t *dfa)
}
break;
default:
@@ -27,4 +24,3 @@
}
if (mb_chars || has_period)
-
diff --git a/grub-core/gnulib-no-gets.diff b/grub-core/gnulib-no-gets.diff
deleted file mode 100644
index 1a9487e84..000000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/x.diff 2013-04-11 16:51:42.777873536 +0200
-+++ grub-core/gnulib/stdio.in.h 2013-04-11 16:51:49.917873298 +0200
-@@ -700,7 +700,6 @@
- removed it. */
- #undef gets
- #if HAVE_RAW_DECL_GETS
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
-
Colin Watson (1):
Upgrade Gnulib; switch to bootstrap tool
.gitignore | 31 +-
ABOUT-NLS | 223 -
autogen.sh | 20 +-
bootstrap | 1073 ++++
bootstrap.conf | 89 +
build-aux/config.rpath | 690 ---
build-aux/gitlog-to-changelog | 432 --
build-aux/snippet/_Noreturn.h | 10 -
build-aux/snippet/arg-nonnull.h | 26 -
build-aux/snippet/c++defs.h | 271 -
build-aux/snippet/warn-on-use.h | 109 -
conf/Makefile.common | 2 +-
conf/Makefile.extra-dist | 1 -
configure.ac | 5 +-
docs/grub-dev.texi | 2 +-
grub-core/gnulib-fix-gcc7-fallthrough.diff | 14 -
grub-core/gnulib-fix-null-deref.diff | 10 +-
grub-core/gnulib-fix-width.diff | 96 +-
grub-core/gnulib-no-abort.diff | 24 +-
grub-core/gnulib-no-gets.diff | 10 -
grub-core/gnulib/Makefile.am | 1747 ------
grub-core/gnulib/alloca.c | 478 --
grub-core/gnulib/alloca.in.h | 63 -
grub-core/gnulib/argp-ba.c | 34 -
grub-core/gnulib/argp-eexst.c | 30 -
grub-core/gnulib/argp-fmtstream.c | 488 --
grub-core/gnulib/argp-fmtstream.h | 359 --
grub-core/gnulib/argp-fs-xinl.c | 46 -
grub-core/gnulib/argp-help.c | 1960 -------
grub-core/gnulib/argp-namefrob.h | 157 -
grub-core/gnulib/argp-parse.c | 953 ----
grub-core/gnulib/argp-pin.c | 26 -
grub-core/gnulib/argp-pv.c | 34 -
grub-core/gnulib/argp-pvh.c | 31 -
grub-core/gnulib/argp-xinl.c | 46 -
grub-core/gnulib/argp.h | 650 ---
grub-core/gnulib/asnprintf.c | 34 -
grub-core/gnulib/basename-lgpl.c | 75 -
grub-core/gnulib/btowc.c | 39 -
grub-core/gnulib/config.charset | 684 ---
grub-core/gnulib/dirname-lgpl.c | 86 -
grub-core/gnulib/dirname.h | 46 -
grub-core/gnulib/dosname.h | 53 -
grub-core/gnulib/errno.in.h | 279 -
grub-core/gnulib/error.c | 401 --
grub-core/gnulib/error.h | 65 -
grub-core/gnulib/float+.h | 147 -
grub-core/gnulib/float.c | 33 -
grub-core/gnulib/float.in.h | 188 -
grub-core/gnulib/fnmatch.c | 350 --
grub-core/gnulib/fnmatch.in.h | 67 -
grub-core/gnulib/fnmatch_loop.c | 1219 -----
grub-core/gnulib/getdelim.c | 135 -
grub-core/gnulib/getline.c | 27 -
grub-core/gnulib/getopt.c | 1245 -----
grub-core/gnulib/getopt.in.h | 255 -
grub-core/gnulib/getopt1.c | 170 -
grub-core/gnulib/getopt_int.h | 135 -
grub-core/gnulib/gettext.h | 288 -
grub-core/gnulib/intprops.h | 319 --
grub-core/gnulib/itold.c | 28 -
grub-core/gnulib/langinfo.in.h | 176 -
grub-core/gnulib/localcharset.c | 553 --
grub-core/gnulib/localcharset.h | 40 -
grub-core/gnulib/locale.in.h | 216 -
grub-core/gnulib/localeconv.c | 103 -
grub-core/gnulib/malloc.c | 56 -
grub-core/gnulib/mbrtowc.c | 402 --
grub-core/gnulib/mbsinit.c | 61 -
grub-core/gnulib/mbsrtowcs-impl.h | 122 -
grub-core/gnulib/mbsrtowcs-state.c | 37 -
grub-core/gnulib/mbsrtowcs.c | 32 -
grub-core/gnulib/mbswidth.c | 199 -
grub-core/gnulib/mbswidth.h | 63 -
grub-core/gnulib/mbtowc-impl.h | 44 -
grub-core/gnulib/mbtowc.c | 26 -
grub-core/gnulib/memchr.c | 172 -
grub-core/gnulib/memchr.valgrind | 14 -
grub-core/gnulib/mempcpy.c | 28 -
grub-core/gnulib/msvc-inval.c | 129 -
grub-core/gnulib/msvc-inval.h | 222 -
grub-core/gnulib/msvc-nothrow.c | 49 -
grub-core/gnulib/msvc-nothrow.h | 43 -
grub-core/gnulib/nl_langinfo.c | 271 -
grub-core/gnulib/printf-args.c | 187 -
grub-core/gnulib/printf-args.h | 158 -
grub-core/gnulib/printf-parse.c | 638 ---
grub-core/gnulib/printf-parse.h | 193 -
grub-core/gnulib/progname.c | 92 -
grub-core/gnulib/progname.h | 62 -
grub-core/gnulib/rawmemchr.c | 136 -
grub-core/gnulib/rawmemchr.valgrind | 12 -
grub-core/gnulib/realloc.c | 79 -
grub-core/gnulib/ref-add.sin | 29 -
grub-core/gnulib/ref-del.sin | 24 -
grub-core/gnulib/regcomp.c | 3913 --------------
grub-core/gnulib/regex.c | 81 -
grub-core/gnulib/regex.h | 667 ---
grub-core/gnulib/regex_internal.c | 1741 ------
grub-core/gnulib/regex_internal.h | 873 ---
grub-core/gnulib/regexec.c | 4417 ---------------
grub-core/gnulib/size_max.h | 30 -
grub-core/gnulib/sleep.c | 76 -
grub-core/gnulib/stdalign.in.h | 90 -
grub-core/gnulib/stdbool.in.h | 132 -
grub-core/gnulib/stddef.in.h | 86 -
grub-core/gnulib/stdint.in.h | 636 ---
grub-core/gnulib/stdio.in.h | 1333 -----
grub-core/gnulib/stdlib.in.h | 954 ----
grub-core/gnulib/strcasecmp.c | 62 -
grub-core/gnulib/strchrnul.c | 142 -
grub-core/gnulib/strchrnul.valgrind | 12 -
grub-core/gnulib/streq.h | 176 -
grub-core/gnulib/strerror-override.c | 302 --
grub-core/gnulib/strerror-override.h | 56 -
grub-core/gnulib/strerror.c | 70 -
grub-core/gnulib/string.in.h | 1029 ----
grub-core/gnulib/strings.in.h | 122 -
grub-core/gnulib/stripslash.c | 45 -
grub-core/gnulib/strncasecmp.c | 62 -
grub-core/gnulib/strndup.c | 36 -
grub-core/gnulib/strnlen.c | 30 -
grub-core/gnulib/strnlen1.c | 35 -
grub-core/gnulib/strnlen1.h | 40 -
grub-core/gnulib/sys_types.in.h | 51 -
grub-core/gnulib/sysexits.in.h | 72 -
grub-core/gnulib/unistd.c | 3 -
grub-core/gnulib/unistd.in.h | 1530 ------
grub-core/gnulib/unitypes.in.h | 46 -
grub-core/gnulib/uniwidth.in.h | 72 -
grub-core/gnulib/uniwidth/cjk.h | 37 -
grub-core/gnulib/uniwidth/width.c | 368 --
grub-core/gnulib/vasnprintf.c | 5606 --------------------
grub-core/gnulib/vasnprintf.h | 79 -
grub-core/gnulib/verify.h | 245 -
grub-core/gnulib/vsnprintf.c | 70 -
grub-core/gnulib/wchar.in.h | 1028 ----
grub-core/gnulib/wcrtomb.c | 53 -
grub-core/gnulib/wctype-h.c | 4 -
grub-core/gnulib/wctype.in.h | 504 --
grub-core/gnulib/wcwidth.c | 50 -
grub-core/gnulib/xsize.c | 3 -
grub-core/gnulib/xsize.h | 114 -
m4/00gnulib.m4 | 30 -
m4/alloca.m4 | 121 -
m4/argp.m4 | 61 -
m4/btowc.m4 | 116 -
m4/codeset.m4 | 23 -
m4/configmake.m4 | 50 -
m4/dirname.m4 | 19 -
m4/double-slash-root.m4 | 38 -
m4/eealloc.m4 | 31 -
m4/errno_h.m4 | 137 -
m4/error.m4 | 27 -
m4/exponentd.m4 | 116 -
m4/extensions.m4 | 138 -
m4/extern-inline.m4 | 100 -
m4/fcntl-o.m4 | 134 -
m4/float_h.m4 | 98 -
m4/fnmatch.m4 | 156 -
m4/getdelim.m4 | 88 -
m4/getline.m4 | 96 -
m4/getopt.m4 | 368 --
m4/gettext.m4 | 401 --
m4/glibc2.m4 | 31 -
m4/glibc21.m4 | 34 -
m4/gnulib-cache.m4 | 55 -
m4/gnulib-common.m4 | 377 --
m4/gnulib-comp.m4 | 756 ---
m4/gnulib-tool.m4 | 57 -
m4/iconv.m4 | 268 -
m4/include_next.m4 | 270 -
m4/intdiv0.m4 | 87 -
m4/intl.m4 | 300 --
m4/intldir.m4 | 19 -
m4/intlmacosx.m4 | 56 -
m4/intmax.m4 | 36 -
m4/intmax_t.m4 | 67 -
m4/inttypes-pri.m4 | 42 -
m4/inttypes_h.m4 | 29 -
m4/langinfo_h.m4 | 105 -
m4/lcmessage.m4 | 35 -
m4/lib-ld.m4 | 119 -
m4/lib-link.m4 | 777 ---
m4/lib-prefix.m4 | 224 -
m4/libunistring-base.m4 | 141 -
m4/localcharset.m4 | 17 -
m4/locale-fr.m4 | 250 -
m4/locale-ja.m4 | 136 -
m4/locale-zh.m4 | 130 -
m4/locale_h.m4 | 122 -
m4/localeconv.m4 | 22 -
m4/lock.m4 | 39 -
m4/longlong.m4 | 113 -
m4/malloc.m4 | 98 -
m4/math_h.m4 | 353 --
m4/mbrtowc.m4 | 572 --
m4/mbsinit.m4 | 51 -
m4/mbsrtowcs.m4 | 155 -
m4/mbstate_t.m4 | 41 -
m4/mbswidth.m4 | 46 -
m4/mbtowc.m4 | 19 -
m4/memchr.m4 | 88 -
m4/mempcpy.m4 | 26 -
m4/mmap-anon.m4 | 55 -
m4/msvc-inval.m4 | 19 -
m4/msvc-nothrow.m4 | 10 -
m4/multiarch.m4 | 62 -
m4/nl_langinfo.m4 | 50 -
m4/nls.m4 | 32 -
m4/nocrash.m4 | 130 -
m4/off_t.m4 | 18 -
m4/po.m4 | 452 --
m4/printf-posix.m4 | 48 -
m4/printf.m4 | 1570 ------
m4/progtest.m4 | 91 -
m4/rawmemchr.m4 | 20 -
m4/realloc.m4 | 76 -
m4/regex.m4 | 261 -
m4/size_max.m4 | 79 -
m4/sleep.m4 | 62 -
m4/ssize_t.m4 | 23 -
m4/stdalign.m4 | 52 -
m4/stdbool.m4 | 100 -
m4/stddef_h.m4 | 47 -
m4/stdint.m4 | 484 --
m4/stdint_h.m4 | 27 -
m4/stdio_h.m4 | 194 -
m4/stdlib_h.m4 | 117 -
m4/strcase.m4 | 45 -
m4/strchrnul.m4 | 50 -
m4/strerror.m4 | 96 -
m4/string_h.m4 | 120 -
m4/strings_h.m4 | 52 -
m4/strndup.m4 | 55 -
m4/strnlen.m4 | 30 -
m4/sys_socket_h.m4 | 176 -
m4/sys_types_h.m4 | 24 -
m4/sysexits.m4 | 44 -
m4/threadlib.m4 | 371 --
m4/uintmax_t.m4 | 30 -
m4/unistd_h.m4 | 186 -
m4/vasnprintf.m4 | 291 -
m4/visibility.m4 | 77 -
m4/vsnprintf.m4 | 54 -
m4/warn-on-use.m4 | 47 -
m4/wchar_h.m4 | 225 -
m4/wchar_t.m4 | 24 -
m4/wcrtomb.m4 | 112 -
m4/wctype_h.m4 | 209 -
m4/wcwidth.m4 | 101 -
m4/wint_t.m4 | 32 -
m4/xsize.m4 | 12 -
po/Makefile.in.in | 469 --
po/Makevars | 41 -
po/Rules-quot | 47 -
256 files changed, 1252 insertions(+), 62817 deletions(-)
delete mode 100644 ABOUT-NLS
create mode 100755 bootstrap
create mode 100644 bootstrap.conf
delete mode 100755 build-aux/config.rpath
delete mode 100755 build-aux/gitlog-to-changelog
delete mode 100644 build-aux/snippet/_Noreturn.h
delete mode 100644 build-aux/snippet/arg-nonnull.h
delete mode 100644 build-aux/snippet/c++defs.h
delete mode 100644 build-aux/snippet/warn-on-use.h
delete mode 100644 grub-core/gnulib-fix-gcc7-fallthrough.diff
delete mode 100644 grub-core/gnulib-no-gets.diff
delete mode 100644 grub-core/gnulib/Makefile.am
delete mode 100644 grub-core/gnulib/alloca.c
delete mode 100644 grub-core/gnulib/alloca.in.h
delete mode 100644 grub-core/gnulib/argp-ba.c
delete mode 100644 grub-core/gnulib/argp-eexst.c
delete mode 100644 grub-core/gnulib/argp-fmtstream.c
delete mode 100644 grub-core/gnulib/argp-fmtstream.h
delete mode 100644 grub-core/gnulib/argp-fs-xinl.c
delete mode 100644 grub-core/gnulib/argp-help.c
delete mode 100644 grub-core/gnulib/argp-namefrob.h
delete mode 100644 grub-core/gnulib/argp-parse.c
delete mode 100644 grub-core/gnulib/argp-pin.c
delete mode 100644 grub-core/gnulib/argp-pv.c
delete mode 100644 grub-core/gnulib/argp-pvh.c
delete mode 100644 grub-core/gnulib/argp-xinl.c
delete mode 100644 grub-core/gnulib/argp.h
delete mode 100644 grub-core/gnulib/asnprintf.c
delete mode 100644 grub-core/gnulib/basename-lgpl.c
delete mode 100644 grub-core/gnulib/btowc.c
delete mode 100644 grub-core/gnulib/config.charset
delete mode 100644 grub-core/gnulib/dirname-lgpl.c
delete mode 100644 grub-core/gnulib/dirname.h
delete mode 100644 grub-core/gnulib/dosname.h
delete mode 100644 grub-core/gnulib/errno.in.h
delete mode 100644 grub-core/gnulib/error.c
delete mode 100644 grub-core/gnulib/error.h
delete mode 100644 grub-core/gnulib/float+.h
delete mode 100644 grub-core/gnulib/float.c
delete mode 100644 grub-core/gnulib/float.in.h
delete mode 100644 grub-core/gnulib/fnmatch.c
delete mode 100644 grub-core/gnulib/fnmatch.in.h
delete mode 100644 grub-core/gnulib/fnmatch_loop.c
delete mode 100644 grub-core/gnulib/getdelim.c
delete mode 100644 grub-core/gnulib/getline.c
delete mode 100644 grub-core/gnulib/getopt.c
delete mode 100644 grub-core/gnulib/getopt.in.h
delete mode 100644 grub-core/gnulib/getopt1.c
delete mode 100644 grub-core/gnulib/getopt_int.h
delete mode 100644 grub-core/gnulib/gettext.h
delete mode 100644 grub-core/gnulib/intprops.h
delete mode 100644 grub-core/gnulib/itold.c
delete mode 100644 grub-core/gnulib/langinfo.in.h
delete mode 100644 grub-core/gnulib/localcharset.c
delete mode 100644 grub-core/gnulib/localcharset.h
delete mode 100644 grub-core/gnulib/locale.in.h
delete mode 100644 grub-core/gnulib/localeconv.c
delete mode 100644 grub-core/gnulib/malloc.c
delete mode 100644 grub-core/gnulib/mbrtowc.c
delete mode 100644 grub-core/gnulib/mbsinit.c
delete mode 100644 grub-core/gnulib/mbsrtowcs-impl.h
delete mode 100644 grub-core/gnulib/mbsrtowcs-state.c
delete mode 100644 grub-core/gnulib/mbsrtowcs.c
delete mode 100644 grub-core/gnulib/mbswidth.c
delete mode 100644 grub-core/gnulib/mbswidth.h
delete mode 100644 grub-core/gnulib/mbtowc-impl.h
delete mode 100644 grub-core/gnulib/mbtowc.c
delete mode 100644 grub-core/gnulib/memchr.c
delete mode 100644 grub-core/gnulib/memchr.valgrind
delete mode 100644 grub-core/gnulib/mempcpy.c
delete mode 100644 grub-core/gnulib/msvc-inval.c
delete mode 100644 grub-core/gnulib/msvc-inval.h
delete mode 100644 grub-core/gnulib/msvc-nothrow.c
delete mode 100644 grub-core/gnulib/msvc-nothrow.h
delete mode 100644 grub-core/gnulib/nl_langinfo.c
delete mode 100644 grub-core/gnulib/printf-args.c
delete mode 100644 grub-core/gnulib/printf-args.h
delete mode 100644 grub-core/gnulib/printf-parse.c
delete mode 100644 grub-core/gnulib/printf-parse.h
delete mode 100644 grub-core/gnulib/progname.c
delete mode 100644 grub-core/gnulib/progname.h
delete mode 100644 grub-core/gnulib/rawmemchr.c
delete mode 100644 grub-core/gnulib/rawmemchr.valgrind
delete mode 100644 grub-core/gnulib/realloc.c
delete mode 100644 grub-core/gnulib/ref-add.sin
delete mode 100644 grub-core/gnulib/ref-del.sin
delete mode 100644 grub-core/gnulib/regcomp.c
delete mode 100644 grub-core/gnulib/regex.c
delete mode 100644 grub-core/gnulib/regex.h
delete mode 100644 grub-core/gnulib/regex_internal.c
delete mode 100644 grub-core/gnulib/regex_internal.h
delete mode 100644 grub-core/gnulib/regexec.c
delete mode 100644 grub-core/gnulib/size_max.h
delete mode 100644 grub-core/gnulib/sleep.c
delete mode 100644 grub-core/gnulib/stdalign.in.h
delete mode 100644 grub-core/gnulib/stdbool.in.h
delete mode 100644 grub-core/gnulib/stddef.in.h
delete mode 100644 grub-core/gnulib/stdint.in.h
delete mode 100644 grub-core/gnulib/stdio.in.h
delete mode 100644 grub-core/gnulib/stdlib.in.h
delete mode 100644 grub-core/gnulib/strcasecmp.c
delete mode 100644 grub-core/gnulib/strchrnul.c
delete mode 100644 grub-core/gnulib/strchrnul.valgrind
delete mode 100644 grub-core/gnulib/streq.h
delete mode 100644 grub-core/gnulib/strerror-override.c
delete mode 100644 grub-core/gnulib/strerror-override.h
delete mode 100644 grub-core/gnulib/strerror.c
delete mode 100644 grub-core/gnulib/string.in.h
delete mode 100644 grub-core/gnulib/strings.in.h
delete mode 100644 grub-core/gnulib/stripslash.c
delete mode 100644 grub-core/gnulib/strncasecmp.c
delete mode 100644 grub-core/gnulib/strndup.c
delete mode 100644 grub-core/gnulib/strnlen.c
delete mode 100644 grub-core/gnulib/strnlen1.c
delete mode 100644 grub-core/gnulib/strnlen1.h
delete mode 100644 grub-core/gnulib/sys_types.in.h
delete mode 100644 grub-core/gnulib/sysexits.in.h
delete mode 100644 grub-core/gnulib/unistd.c
delete mode 100644 grub-core/gnulib/unistd.in.h
delete mode 100644 grub-core/gnulib/unitypes.in.h
delete mode 100644 grub-core/gnulib/uniwidth.in.h
delete mode 100644 grub-core/gnulib/uniwidth/cjk.h
delete mode 100644 grub-core/gnulib/uniwidth/width.c
delete mode 100644 grub-core/gnulib/vasnprintf.c
delete mode 100644 grub-core/gnulib/vasnprintf.h
delete mode 100644 grub-core/gnulib/verify.h
delete mode 100644 grub-core/gnulib/vsnprintf.c
delete mode 100644 grub-core/gnulib/wchar.in.h
delete mode 100644 grub-core/gnulib/wcrtomb.c
delete mode 100644 grub-core/gnulib/wctype-h.c
delete mode 100644 grub-core/gnulib/wctype.in.h
delete mode 100644 grub-core/gnulib/wcwidth.c
delete mode 100644 grub-core/gnulib/xsize.c
delete mode 100644 grub-core/gnulib/xsize.h
delete mode 100644 m4/00gnulib.m4
delete mode 100644 m4/alloca.m4
delete mode 100644 m4/argp.m4
delete mode 100644 m4/btowc.m4
delete mode 100644 m4/codeset.m4
delete mode 100644 m4/configmake.m4
delete mode 100644 m4/dirname.m4
delete mode 100644 m4/double-slash-root.m4
delete mode 100644 m4/eealloc.m4
delete mode 100644 m4/errno_h.m4
delete mode 100644 m4/error.m4
delete mode 100644 m4/exponentd.m4
delete mode 100644 m4/extensions.m4
delete mode 100644 m4/extern-inline.m4
delete mode 100644 m4/fcntl-o.m4
delete mode 100644 m4/float_h.m4
delete mode 100644 m4/fnmatch.m4
delete mode 100644 m4/getdelim.m4
delete mode 100644 m4/getline.m4
delete mode 100644 m4/getopt.m4
delete mode 100644 m4/gettext.m4
delete mode 100644 m4/glibc2.m4
delete mode 100644 m4/glibc21.m4
delete mode 100644 m4/gnulib-cache.m4
delete mode 100644 m4/gnulib-common.m4
delete mode 100644 m4/gnulib-comp.m4
delete mode 100644 m4/gnulib-tool.m4
delete mode 100644 m4/iconv.m4
delete mode 100644 m4/include_next.m4
delete mode 100644 m4/intdiv0.m4
delete mode 100644 m4/intl.m4
delete mode 100644 m4/intldir.m4
delete mode 100644 m4/intlmacosx.m4
delete mode 100644 m4/intmax.m4
delete mode 100644 m4/intmax_t.m4
delete mode 100644 m4/inttypes-pri.m4
delete mode 100644 m4/inttypes_h.m4
delete mode 100644 m4/langinfo_h.m4
delete mode 100644 m4/lcmessage.m4
delete mode 100644 m4/lib-ld.m4
delete mode 100644 m4/lib-link.m4
delete mode 100644 m4/lib-prefix.m4
delete mode 100644 m4/libunistring-base.m4
delete mode 100644 m4/localcharset.m4
delete mode 100644 m4/locale-fr.m4
delete mode 100644 m4/locale-ja.m4
delete mode 100644 m4/locale-zh.m4
delete mode 100644 m4/locale_h.m4
delete mode 100644 m4/localeconv.m4
delete mode 100644 m4/lock.m4
delete mode 100644 m4/longlong.m4
delete mode 100644 m4/malloc.m4
delete mode 100644 m4/math_h.m4
delete mode 100644 m4/mbrtowc.m4
delete mode 100644 m4/mbsinit.m4
delete mode 100644 m4/mbsrtowcs.m4
delete mode 100644 m4/mbstate_t.m4
delete mode 100644 m4/mbswidth.m4
delete mode 100644 m4/mbtowc.m4
delete mode 100644 m4/memchr.m4
delete mode 100644 m4/mempcpy.m4
delete mode 100644 m4/mmap-anon.m4
delete mode 100644 m4/msvc-inval.m4
delete mode 100644 m4/msvc-nothrow.m4
delete mode 100644 m4/multiarch.m4
delete mode 100644 m4/nl_langinfo.m4
delete mode 100644 m4/nls.m4
delete mode 100644 m4/nocrash.m4
delete mode 100644 m4/off_t.m4
delete mode 100644 m4/po.m4
delete mode 100644 m4/printf-posix.m4
delete mode 100644 m4/printf.m4
delete mode 100644 m4/progtest.m4
delete mode 100644 m4/rawmemchr.m4
delete mode 100644 m4/realloc.m4
delete mode 100644 m4/regex.m4
delete mode 100644 m4/size_max.m4
delete mode 100644 m4/sleep.m4
delete mode 100644 m4/ssize_t.m4
delete mode 100644 m4/stdalign.m4
delete mode 100644 m4/stdbool.m4
delete mode 100644 m4/stddef_h.m4
delete mode 100644 m4/stdint.m4
delete mode 100644 m4/stdint_h.m4
delete mode 100644 m4/stdio_h.m4
delete mode 100644 m4/stdlib_h.m4
delete mode 100644 m4/strcase.m4
delete mode 100644 m4/strchrnul.m4
delete mode 100644 m4/strerror.m4
delete mode 100644 m4/string_h.m4
delete mode 100644 m4/strings_h.m4
delete mode 100644 m4/strndup.m4
delete mode 100644 m4/strnlen.m4
delete mode 100644 m4/sys_socket_h.m4
delete mode 100644 m4/sys_types_h.m4
delete mode 100644 m4/sysexits.m4
delete mode 100644 m4/threadlib.m4
delete mode 100644 m4/uintmax_t.m4
delete mode 100644 m4/unistd_h.m4
delete mode 100644 m4/vasnprintf.m4
delete mode 100644 m4/visibility.m4
delete mode 100644 m4/vsnprintf.m4
delete mode 100644 m4/warn-on-use.m4
delete mode 100644 m4/wchar_h.m4
delete mode 100644 m4/wchar_t.m4
delete mode 100644 m4/wcrtomb.m4
delete mode 100644 m4/wctype_h.m4
delete mode 100644 m4/wcwidth.m4
delete mode 100644 m4/wint_t.m4
delete mode 100644 m4/xsize.m4
delete mode 100644 po/Makefile.in.in
delete mode 100644 po/Makevars
delete mode 100644 po/Rules-quot
--
2.20.1
- [PATCH 0/1] Upgrade Gnulib; switch to bootstrap tool,
Colin Watson <=