From 5e5560556a2a75bfd1e6e8165a5f4e949ed5afe6 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 6 Jan 2014 14:33:08 -0700
Subject: [PATCH] build: fix 'make check' with newer git

Newer git doesn't like the maint.mk rule 'public-submodule-commit'
that was associated with the version of maint.mk in our checkout
of gnulib.  I tracked down that libvirt commit 8531301 picked up
a gnulib fix that makes git happy.  Basically, that libvirt commit
uses maint.mk from gnulib.git commit d18d1b802.  Rather than try
and backport .gnulib submodule changes, this is a downstream
variant that uses just the newer maint.mk from the known-good
submodule state, as follows:

mkdir -p gnulib/local/top
cd .gnulib
git checkout d18d1b802 top/maint.mk
git diff HEAD > ../gnulib/local/top/maint.mk.diff
git reset --hard
cd ..
git add gnulib/local/top

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 gnulib/local/top/maint.mk.diff | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 gnulib/local/top/maint.mk.diff

diff --git a/gnulib/local/top/maint.mk.diff b/gnulib/local/top/maint.mk.diff
new file mode 100644
index 0000000000..dfed90bfc0
--- /dev/null
+++ b/gnulib/local/top/maint.mk.diff
@@ -0,0 +1,33 @@
+diff --git c/top/maint.mk w/top/maint.mk
+index 9c02ed4..d5bb427 100644
+--- c/top/maint.mk
++++ w/top/maint.mk
+@@ -2,7 +2,7 @@
+ # This Makefile fragment tries to be general-purpose enough to be
+ # used by many projects via the gnulib maintainer-makefile module.
+
+-## Copyright (C) 2001-2013 Free Software Foundation, Inc.
++## Copyright (C) 2001-2014 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
+@@ -591,7 +591,7 @@ sc_prohibit_root_dev_ino_without_use:
+
+ sc_prohibit_openat_without_use:
+ 	@h='openat.h' \
+-	re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat)\>' \
++	re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>' \
+ 	  $(_sc_header_without_use)
+
+ # Prohibit the inclusion of c-ctype.h without an actual use.
+@@ -1395,8 +1395,8 @@ public-submodule-commit:
+ 		&& git --version >/dev/null 2>&1; then			\
+ 	  cd $(srcdir) &&						\
+ 	  git submodule --quiet foreach					\
+-	      test '"$$(git rev-parse "$$sha1")"'			\
+-	      = '"$$(git merge-base origin "$$sha1")"'			\
++	      'test "$$(git rev-parse "$$sha1")"			\
++		  = "$$(git merge-base origin "$$sha1")"'		\
+ 	    || { echo '$(ME): found non-public submodule commit' >&2;	\
+ 		 exit 1; };						\
+ 	else								\
-- 
2.47.3