From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 27 Nov 2013 10:57:27 +0000 (+0000)
Subject: Merge branch 'new-autogen'
X-Git-Tag: grub-2.02-beta1~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf8c80ff77a0d13815c3ad88aa56573ec6e59540;p=thirdparty%2Fgrub.git

Merge branch 'new-autogen'
---

cf8c80ff77a0d13815c3ad88aa56573ec6e59540
diff --cc ChangeLog
index 4bbec8607,88b3c83e5..630bfa9cd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,9 +1,21 @@@
 -2013-11-26  Colin Watson  <cjwatson@ubuntu.com>
++2013-11-27  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Generate Makefile.*.am directly from gentpl.py, eliminating the use
+ 	of Autogen.  The Autogen definitions files remain intact as they
+ 	offer a useful abstraction.
+ 
 +2013-11-27  Colin Watson  <cjwatson@ubuntu.com>
 +
 +	Add grub_util_disable_fd_syncs call to turn grub_util_fd_sync calls
 +	into no-ops, and use it in programs that copy files but do not need
 +	to take special care to sync writes (grub-mknetdir, grub-rescue,
 +	grub-mkstandalone).
 +
 +2013-11-26  Colin Watson  <cjwatson@ubuntu.com>
 +
 +	* tests/util/grub-fs-tester.in: Execute xorriso from $PATH rather
 +	than hardcoding /usr/local/bin/xorriso.
 +
  2013-11-26  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	Add PCI command activation to all PCI drivers as required for coreboot