grub: fix building with new automake

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 75 insertions, 9 deletions

diff --git a/patches/grub-0.97/0001-fix-static-declaration.patch b/patches/grub-0.97/0001-fix-static-declaration.patch
index c8d50f373..9b12dc006 100644
--- a/patches/grub-0.97/0001-fix-static-declaration.patch
+++ b/patches/grub-0.97/0001-fix-static-declaration.patch
@@ -7,8 +7,8 @@ versa as error.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
 ---
- netboot/main.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ netboot/main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/netboot/main.c b/netboot/main.c
 index 82759b6..abd9212 100644
diff --git a/patches/grub-0.97/0002-Add-hack-for-default-partition.patch b/patches/grub-0.97/0002-Add-hack-for-default-partition.patch
index cda1ef21f..6fd31df5e 100644
--- a/patches/grub-0.97/0002-Add-hack-for-default-partition.patch
+++ b/patches/grub-0.97/0002-Add-hack-for-default-partition.patch
@@ -8,8 +8,8 @@ but I don't know any.
 
 Signed-off-by: (not for upstream)
 ---
- stage2/asm.S |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ stage2/asm.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/stage2/asm.S b/stage2/asm.S
 index 34b6e7d..bf157cf 100644
diff --git a/patches/grub-0.97/0003-cleanup-autotools-a-bit.patch b/patches/grub-0.97/0003-cleanup-autotools-a-bit.patch
index 4d969c0b7..56b3bc7f7 100644
--- a/patches/grub-0.97/0003-cleanup-autotools-a-bit.patch
+++ b/patches/grub-0.97/0003-cleanup-autotools-a-bit.patch
@@ -8,8 +8,8 @@ Taken from Gentoo. Needed for autoreconf.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- configure.ac |    7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
+ configure.ac | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index bb9e1d9..a47258c 100644
diff --git a/patches/grub-0.97/0004-Work-around-a-miscompilation-of-stage2-with-GCC-4.6.patch b/patches/grub-0.97/0004-Work-around-a-miscompilation-of-stage2-with-GCC-4.6.patch
index e08ea2d1e..1bfa8de49 100644
--- a/patches/grub-0.97/0004-Work-around-a-miscompilation-of-stage2-with-GCC-4.6.patch
+++ b/patches/grub-0.97/0004-Work-around-a-miscompilation-of-stage2-with-GCC-4.6.patch
@@ -14,8 +14,8 @@ Patch taken from Gentoo.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- stage2/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ stage2/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/stage2/Makefile.am b/stage2/Makefile.am
 index f8e6d42..24b07e2 100644
diff --git a/patches/grub-0.97/0005-make-it-work-with-automake-1.14.patch b/patches/grub-0.97/0005-make-it-work-with-automake-1.14.patch
new file mode 100644
index 000000000..518b70f35
--- /dev/null
+++ b/patches/grub-0.97/0005-make-it-work-with-automake-1.14.patch
@@ -0,0 +1,65 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 20 Mar 2014 10:12:07 +0100
+Subject: [PATCH] make it work with automake 1.14
+
+pkglibdir has special meaning and newer automake version don't allow
+installer DATA here.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ stage1/Makefile.am | 6 +++---
+ stage2/Makefile.am | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/stage1/Makefile.am b/stage1/Makefile.am
+index 0afc285..d850e10 100644
+--- a/stage1/Makefile.am
++++ b/stage1/Makefile.am
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++libpkgdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_libpkg_DATA = stage1
+ 
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_libpkg_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+diff --git a/stage2/Makefile.am b/stage2/Makefile.am
+index 24b07e2..aee1563 100644
+--- a/stage2/Makefile.am
++++ b/stage2/Makefile.am
+@@ -27,12 +27,12 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
+ 	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+ 
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++libpkgdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ 
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+ 
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++libpkg_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+ 	nbgrub pxegrub
+@@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
+ 	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+ 	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++libpkg_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -105,7 +105,7 @@ else
+ BUILT_SOURCES = stage2_size.h
+ endif
+ 
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(libpkg_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+ 
+ stage2_size.h: pre_stage2
+ 	-rm -f stage2_size.h
diff --git a/patches/grub-0.97/series b/patches/grub-0.97/series
index aecc263a6..0833cc7c9 100644
--- a/patches/grub-0.97/series
+++ b/patches/grub-0.97/series
@@ -4,4 +4,5 @@
 0002-Add-hack-for-default-partition.patch
 0003-cleanup-autotools-a-bit.patch
 0004-Work-around-a-miscompilation-of-stage2-with-GCC-4.6.patch
-# 5d726d5276afb556c3b49f8ddc24e226  - git-ptx-patches magic
+0005-make-it-work-with-automake-1.14.patch
+# 042f6442b03fbf2c8eaea19b42617475  - git-ptx-patches magic