[PATCH 1/2] multiboot: Allow running autogen.sh

[PATCH 1/2] multiboot: Allow running autogen.sh

[Hans Ulrich Niedermann]

Current gnulib's gnulib-tool only runs if configure.ac contains
AC_PREREQ(2.63).

As Autoconf 2.63 has been released in 2008-09, this should not
affect too many systems in 2020.

Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5482aeff8..e9a1801c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl "AS IS" CONDITION.  THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY
 dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 AC_INIT([Multiboot], [0.6.96], [bug-grub@gnu.org])
 AC_CONFIG_SRCDIR([doc/multiboot.texi])
 AC_CONFIG_HEADER([config.h])
-- 
2.25.2

[PATCH 2/2] multiboot: Use .gitignore files

[Hans Ulrich Niedermann]

Add /.gitignore file and remove the /.bzrignore file.

The /doc/.gitignore file is generated by gnulib-tool so we keep
that file in addition to the top-level /.gitignore file which
covers everything else in subdirectories as well.

Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
---
 .bzrignore     | 30 -----------------------------
 .gitignore     | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/.gitignore |  2 ++
 3 files changed, 54 insertions(+), 30 deletions(-)
 delete mode 100644 .bzrignore
 create mode 100644 .gitignore
 create mode 100644 doc/.gitignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index fda459816..000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,30 +0,0 @@
-gendocs.sh
-lib
-m4
-.deps
-Makefile
-autom4te.cache
-config.cache
-config.h
-config.log
-config.status
-stamp-h
-stamp-h1
-doc/Makefile
-doc/*.info*
-doc/.deps
-doc/gendocs_template
-doc/mdate-sh
-doc/Makefile.in
-doc/boot.S.texi
-doc/kernel
-doc/kernel.c.texi
-doc/multiboot.h.texi
-doc/texinfo.tex
-Makefile.in
-aclocal.m4
-config.h.in
-configure
-depcomp
-install-sh
-missing
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..7fd008fe1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,52 @@
+# Generated by "autogen.sh"
+/gendocs.sh
+/lib/
+/m4/
+
+/NEWS
+/README
+
+Makefile.in
+
+/aclocal.m4
+/autom4te.cache/
+/compile
+/config.h.in
+/configure
+/depcomp
+/doc/mdate-sh
+/doc/texinfo.tex
+/install-sh
+/INSTALL
+/missing
+
+# Generated by "configure"
+Makefile
+.deps/
+
+/config.h
+/config.log
+/config.status
+/stamp-h1
+
+# Generated by "make"
+/doc/*.c.texi
+/doc/*.h.texi
+/doc/*.S.texi
+/doc/multiboot.info*
+/doc/stamp-vti
+/doc/version.texi
+
+*.o
+
+/doc/kernel
+
+/util/mbchk
+/util/mbchk.1
+
+# Generated by "make web-manual"
+/doc/manual/
+/doc/multiboot.aux
+/doc/multiboot.cp
+/doc/multiboot.log
+/doc/multiboot.toc
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000000000..847f66f4d
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+/gendocs_template
+/gendocs_template_min
-- 
2.25.2